Re: undoing a merge

Ben Collins-Sussman <sussman@collab.net> writes:

> He ran 'svn up', not 'svn merge'.

Oops. I did indeed misread.

> If your file had local mods before the update, it should still have
> the same local mods after the update (assuming there was no
> conflict.) Just backdate the file to its previous version ('svn up
> -rPREV foo.c'). Your local mods will still be preserved.

And of course, Ben has the Right Answer.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Dec 18 18:21:39 2003