How do I “undo” merging a specific change set in svn

Question

I have the following scenario.

1) Get a local copy of a repo.

2) Undo a change set I don't want (revision 120). svn merge -c -120 .

3) Do my work modifying files.

4) Now I want to "undo" what I did in (2) without undoing all my changes from (3). Is that possible with svn?

BTW, I'm using Subversion version 1.5.2, in case that matters.

Answer 1

You can svn merge -c 120 . This will exactly undo svn merge -c -120 , done in (2).

Answer 2

You can just call svn merge -c -X on the revision created in (2). If by (3) you mean you have changes in the working tree that are not committed, you can do something like this:

 svn diff >saved.diff
 svn revert -R .
 svn merge -c -X
 patch -p0 <saved.diff