Re: undoing a merge

"Wadsworth, Eric (Contractor)" <wadswore@fhu.disa.mil> writes:

> I do "svn up" and one of my files gets merged with what is in the
> repository. Six seconds later, I decide that I need my original wc file
> back, as it was before the merge.
>
> Is there a way to do this? Some way to configure subversion to make backups
> of my wc files before altering them?

Just reverse the merge.

If you did 'svn merge -r X:Y some_URL my_working_copy_path', then do
'svn merge -r Y:X some_URL my_working_copy_path'.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Dec 18 18:06:10 2003