[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: Rusk, Patrick <PRusk_at_wellington.com>
Date: 2003-12-18 18:15:35 CET

> > 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'.

        Well, if you recast "-r X:Y" as "-r BASE:HEAD", that's essentially
what an update is. So, using "svn merge -r HEAD:BASE <url> <wcpath>" should
work.

        There, cmp! I got my comment in after all!

Patrick Rusk

---------------------------------------------------------------------
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:16:37 2003

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

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