[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: Duncan Murdoch <murdoch_at_stats.uwo.ca>
Date: 2006-02-03 00:33:58 CET

On 2/2/2006 9:35 AM, John Allen wrote:
> On Mon 23 Jan 2006 10:03, jetvm 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. svn revert, that is as long as you have not done an svn commit.

Don't do that, it would lose the local changes that hadn't been
committed before the merge. As others said, merge the reverse of the
revision to undo it.

Duncan Murdoch

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 3 00:37:29 2006

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