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

Re: undoing a merge

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-12-18 18:12:26 CET

On Thu, 2003-12-18 at 11:02, C. Michael Pilato wrote:
> "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'.

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

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.

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:13:12 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.