Yes, if the merge is successful then no copies are created.
You cannot use svn revert as it will provide you with the pristine copy.
I have implemented a policy of always checking in before attempting a
merge.
Thanks
Lakshman
-----Original Message-----
From: jetvm@web.de [mailto:jetvm@web.de]
Sent: Monday, 23 January 2006 9:04 PM
To: users@subversion.tigris.org
Cc: Paul Forgey; HXvard Vold
Subject: Re: Clobbering source file through merge -- can I recover?
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?
Volker
Paul Forgey schrieb:
> I don't know how TortoiseSVN handles this (and it has it's own
> mailing list you may want to ask on), but the normal svn command line
> client always saves backups of the files in question whenever a
> conflict happens.
>
> For example, two users A and B simultaneously change file "file.c".
> A gets his in first. When B tries to commit his changes, he's told
> the repository version is newer. So B does an svn update, which for
> the sake of this example causes a conflict (merges don't always
> conflict). At this point, B now has the following files in his
sandbox:
>
> file.c.mine
> file.c.r1
> file.c.r2
>
> Assuming the repository versions in conflict are 1 and 2.
>
> So no matter how B decides to (mis)handle the conflict, the three
> versions of the file are still there for reference. A good merge
> tool should allow merges on local files as well as repository
> revisions. Your user could re-run this tool using the appropriate
> files for left, right, merge and ancestor.
>
> I'd be very surprised if TortoiseSVN doesn't do something similar.
>
> On Jan 20, 2006, at 6:50 AM, HXvard Vold wrote:
>
>> The client is TortoiseSVN 1.3.0
>>
>> The server is on Linux (Red Hat), with Apache 2.x . This was
>> installed with the most recent standard versions of Apache and
>> Subversion.
>>
>> I assume that this is a usage error, but the idiots, including yours
>> truly, are too smart to allow for the existence of idiotproof
>> software. What I was wondering if there are undo capabilities that
>> could help this set of idiots?
>>
>> Hv
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 24 06:16:12 2006