[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: Scott Palmer <scott.palmer_at_2connected.org>
Date: 2006-02-03 18:05:03 CET

On 2-Feb-06, at 6:53 PM, Ryan Schmidt wrote:

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

Re-read the top line that I quoted. In this case the "merge" is a
result of an "update" action. The *update* will change the base
revision of the files so the only "changes" that can be reverted are
your own.

Scott

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 3 18:36:12 2006

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