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

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

From: Ulrich Eckhardt <Eckhardt_at_satorlaser.com>
Date: 2006-01-23 14:52:35 CET

jetvm@web.de wrote:
> But what happens, if the svn update can merge the file without a
> conflict? Then I do not get the .mine and the two .rXX files. SVN
> changed my work, and i can not go back to the file I had. Is this
> right?

No, you can update to a previous version with '-r'. This will
preserve your local modifications, just as the changes were merged
into the file they are merged out of it when going the other way.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 23 15:03:52 2006

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.