[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: John Allen <john.allen_at_moyville.net>
Date: 2006-02-05 11:34:12 CET

On Friday 03 February 2006 17:05, Scott Palmer wrote:
> 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.
>

I re-read the original original post; I don't know what client this guy was
using, but here is what I basically think he did.

1. commit (failed, need update)
2. update (created conflict)
3. Selected relevant option in whatever GUI tool he was using to replace his
file with latest from repository.
4. *screwed*

Sunversion does not do this. When he had a conflict, he should have had
a .mine file, so he must have chosen an option in his GUI tool to dump his
edits.

> Scott
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org

-- 
John Allen,                          mailto:john.allen@moyville.net
MandrakeClub Silver Member.          http://www.moyville.net
Site of the day: http://www.kde.ie/
Mandriva Linux release 2006.0 (Official) for i586, kernel 2.6.12-12mdk
 10:31:26 up 17 min,  4 users,  load average: 0.02, 0.14, 0.18
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Feb 6 00:46:19 2006

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