Merge problem SVN 1,8

Hello,

I tested merging today and I have a quite severe issue with it. Here's my setup and what I did:

1. VisualSVN Server 2.7.4, so it's SVN 1.8 compatible
2. Current TortoiseSVN on client side
3. TortoiseSVN set up according to this FAQ entry:
   http://tortoisesvn.net/faq.de.html#noautomerge
   Which means, I never want automatic changes of
   my files.
4. As merge tool WinMerge is set up like this:
   C:\Program Files (x86)\WinMerge\WinMergeU.exe /e /s
   /u /dl %tname /dr %merged %theirs %merged

I have a project with a trunk and I created a branch from it.

Both contain the same file foo.c and in both versions I add one line, but with different text. I check in then both. So trunk and branch are different now.

Now I want to reintegrate that branch into the trunk. I have a working copy of the trunk and do a right click on it. I open TortoiseSVN/Merge, select the first of both options (I just want to merge the branch with trunk and leave the branch alone afterwards) and click continue.

On the next screen I select the branch as merge URL and select "all revisions" and click next. Depth is being left on "working copy" and the WC is current. All other options are left alone and I click start.

It finds a conflict on the file where both parties (trunk and branch) added a line each. In Windows explorer I see foo.c, foo.c.working, foo.c.merge-left.r1183 and foo.c.merge-right.r1188. If I click on "edit conflict" WinMerge gets opened, but the right panel is empty. If I click "Resolve later" and then double click on the conflicting file in merge progress dialog WinMerge openes, showing foo.c.merge-right.r1188 and foo.c, but: the line I had added to the trunk version of foo.c (and commited!) is missing!

That line is only present in the foo.c.working file.

Why does this happen? That will not go too well with my users so what did I wrong or how to solve this in a user friendly way?

Regards

Markus

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3084486

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-07-03 16:55:37 CEST