[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Bug in Merge

From: <snigg_at_gmx.net>
Date: Fri, 18 Dec 2009 08:51:26 +0100

Hello Alexander,

thank you for your answer. I think my question was not clear enough.

sgn> That is correct behaviour. You have to commit your working copy to
sgn> fixate the merged changes.

That is ok and I understand that I have to do a commit after a merge. For a better description of my Problem I add three pictures. One shows the diff befor I do a merge. There can you see mine, theirs and the merge. Mine is the working copy, theirs is the repository that I want to merge in my working copy. And merge is the merged file of both.

So when I do a merge and the conflict window expire I press "Use repository" so you can see in the another picture. It is descript in the manual quote of chapter 4.20.7:"Either way, no attempt is made to merge the changes - you choose one or the other." So I it have to take the file how is listed in theirs in the diff window I show.

But what it do is to take the merged file how you can see in my last picture. I hope you understand my problem and recognize the bug. I believe the behaviour of the button "Use repository" is false programed.
Thanks

-- 
GRATIS für alle GMX-Mitglieder: Die maxdome Movie-FLAT!
Jetzt freischalten unter http://portal.gmx.net/de/go/maxdome01
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2431395
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].



diff.JPG conflict_window.JPG use_repository.JPG
Received on 2009-12-18 10:23:28 CET

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