No subject


Sat Jan 29 16:15:38 CST 2011


saying there are conflicts. A fourth panel with this line appears at
the bottom:

?<Merge Conflict>

Then Bob tweaks the output content panel doing the merge, so that it reads:

m] Bob and Alice changed this line
m] <No src line> (in color red)

The "No src line" shouldn't be a problem [1], so he saves the merged
text and exit.
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

Wow..., merged succesfully!

C:\sandbox\bob>type README
Bob changed this line

Ouch... QUESTION: shouldn't the file content be "Bob and Alice changed
this line" ?

C:\sandbox\bob>hg commit -m "merged Bob and Alice changesets"

C:\sandbox\bob>hg push
pushing to c:\sandbox\master
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files

C:\sandbox\master>hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

C:\sandbox\master>type README
Bob changed this line

This is coherent with Bob's repository, but it is not what Bob wanted
to do and expected (he wanted to read "Bob and Alice changed this
line").

As a further detail I'd like to add that when merge is automatically
done by mercurial (for example in another merge test where Alice added
a line at top and Bob at the bottom without conflicting), README on
master would correctly contain the merge of Alice and Bob changes.

[1] http://kdiff3.sourceforge.net/doc/faq.html#id2569841


More information about the Mercurial mailing list