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

Confused by Tortoise Merge Dialog for Simple Example

From: Neil Russell <nrussell_at_apeg.bc.ca>
Date: Fri, 24 Oct 2014 14:17:51 -0700 (PDT)

I was just trying to test a simple branch/merge example for a quick training demo I was putting together and I am a bit confused by the TortoiseMerge dialog.

I created a simple repository with one file called file1.txt containing one line with the text:
"Change 1"

I then created a branch.

Edited trunk and added a new line to file1.txt with the text "Change 2" and committed it.

Edited the branch I just created and added a new line to file2.txt with the text "Change 3" and committed it.

I then did an automatic merge from trunk into the branch and as expected got a conflict dialog. What I don't understand is why Change 1 is listed twice in both the Theirs and Mine windows? I kind of expected to see Change 1 once and the conflict to highlight just change 2 and change 3 lines and be able to select User Their then Mine and end up with:
Change 1
Change 2
Change 3

Instead if I use that option I'll get
Change 1
Change 1
Change 2
Change 1
Change 3

I have attached a screenshot which hopefully makes it clearer.
Can anyone explain the merge dialog to me, I thought I understood it.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-10-24 23:19:02 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.