svn redo after reverse merge

Hi All

I am trying to do following operation

file.txt has 100 revisions and located directly under svn://myrepo.org/trunk

1. svn co svn://myrepo.org/trunk/

2. Undoing few changes made to this file
    svn merge -c -100 svn://myrepo.org/trunk/
    svn merge -c -99 svn://myrepo.org/trunk/
        .....
    svn merge -c -90 svn://myrepo.org/trunk/

3. After resolving all the conflicts I do a commit (bulk)
    svn commit -m "Rolling back rev 100 to 90"

4. Now suppose for some reason I want revision 95 back in, the following
command won't work
    svn merge -c 95 svn://myrepo.org/trunk/
    as according to SVN, revision 95 is already there

Whats the best way to put a change back which was already there but rolled back
due to the reverse merge.

One way to do is to perform commit after every single undo merge operation and
rollback the reverse merge to bring the change back in. But I want to avoid
this approach.

Ankush

      
Received on 2010-09-01 18:16:37 CEST