> -----Original Message-----
> From: ankush chadha [mailto:ankushchadha2003_at_yahoo.com]
> Sent: 01 September 2010 17:16
> To: users_at_subversion.apache.org
> Subject: 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"
>
If you just want to go back to the file as it was in r90, why not just
get a copy of that revision and check it in again with a suitable
comment? Seems a lot less hassle to me (but maybe I am missing
something)...
> 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
>
I'm not sure what you want to do here? Are you wanting to apply the {
r94 > r95 } patch to what is in effect r90? Or just revert to r95 (in
which case you could just get r95 and check it in again)?
> 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.
>
Can you clarify? It seems a slightly odd thing to be doing.
~ mark c
Received on 2010-09-02 07:51:28 CEST