Merge problem (with repro)

HI!

Lately we encounter a particular merge problem pretty often. Maybe this is a
new problem in the latest Tortoise or Subversion versions.

Repro:
Create a text file "MergeTest.txt" with this content in branch B1:
1
2
3
4
5

Copy this file to branch B2.

Change the file in B2 to:
1
2
3
4
5
6
7
8
9
0

Change the file in B2 to:
1
2
3
4
5
A
B
C
D
E
6
7
8
9
0

Now merge the latest commit (with the A, B, C, D, E lines) to the file in
B1.

Of course, this leads to a conflict. But you cannot see in TortoiseMerge,
that only the A, B, C, D, E lines are new. It looks as if also the 6, 7, 8,
9, 0 lines are from this merged diff. So, you cannot decide without looking
at the real diff, which lines you should use to resolve the conflict.

Thomas

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Dec 8 13:03:36 2005