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

Re: Clobbering source file through merge -- can I recover?

From: Kris Deugau <kdeugau_at_vianet.ca>
Date: 2006-02-03 17:27:22 CET

Ryan Schmidt wrote:
> If you merge, and have not committed yet, then you can svn revert those
> changes. Once the merge command is done, the edits look no different to
> Subversion than if you had made them by hand.

Well, sort of. If you have a file with local edits, and a merge makes
additional changes, svn revert on that file will mangle your local
changes along with reverting the merge changes. :/

Which is when you need to reverse-merge, instead of reverting.

-kgd

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 3 17:45:44 2006

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