> From: trlists@clayst.com [mailto:trlists@clayst.com]
>
> So if I committed a bunch of stuff that I shouldn't have
> committed (due
> to a dumb error on my part), then merged it to another branch, and
> committed that, is there any way to undo it all -- to remove several
> revisions off the head of the repository -- other than something with
> svndump?
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. Check that in, then run and debug
it, then check in extra changes you needed to cope with the remove merges.
(It's best to commit the undo merges alone in one revision, so you can later
distinguish which changes are the mechanical undo's and which are the
human-provided adaptations.)
If you made a change in one branch that you want to remove, and then merged
that change with a bunch of others to a second branch, it's probably best to
do the undo on the first branch, then merge that change to the second
branch, which should leave the second branch in the state you want.
Dale
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jun 6 19:56:04 2005