[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Removing Erroneous Revisions

From: <trlists_at_clayst.com>
Date: 2005-06-07 02:45:23 CEST

On 6 Jun 2005 Dale Worley wrote:

> Generally, you want to do a fix that messy with a careful set of "undo
> merges". Check out a sandbox of a branch, then:
>
> svn merge -r101:100 .
> svn merge -r29:28 .
>
> etc. to reverse the changes you want to.

I think this will be easy because i can just reverse merge HEAD:nn
where nn is the last good revision (it was the same on all branches).

But if I did the original commits this way:

        cd /path/to/brancha_wc
        svn commit -m ...
        svn log --stop-on-copy ==> copy was at rev cc
        cd /path/to/branchb_wc
        svn update
        svn merge -r cc:HEAD /path/to/repos/brancha
        svn commit -m ...

then can I reverse it as simply as this, where nn is the last good rev:

        cd /path/to/brancha_wc
        svn merge -r HEAD:nn /path/to/repos/brancha
        svn commit -m ...
        cd /path/to/branchb_wc
        svn merge -r HEAD:nn /path/to/repos/branchb
        svn commit -m ...

This looks pretty easy, given that it is the last half dozen commits
that I want to reverse, i.e. not a subset just everything done since
rev x. Am I missing anything?

Thanks,

--
Tom
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jun 7 02:47:08 2005

This is an archived mail posted to the Subversion Users mailing list.