[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: Ryan Schmidt <subversion-2006Q1_at_ryandesign.com>
Date: 2006-02-03 00:53:02 CET

On Feb 3, 2006, at 00:33, Scott Palmer 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.
>
> svn revert will undo local changes.. it won't undo the merged
> changes from the update because they now match the base revision.
> (right?)
>
> To go back you would have to know what the previous base revision
> was and reverse merge the changes from the update.

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.

---------------------------------------------------------------------
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:54:31 2006

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