[Monotone-devel] Warning when ignoring changed content...

[William Uther]

Hi all,

  A while back there was a complaint on the mailing list that  
monotone was ignoring changed content.  This was happening when there  
were content changes on one side of a merge, and the same node was  
dropped on the other side of the merge.  In this case Monotone would  
silently drop the node from the child.

  I don't think this should be a conflict, but I don't think it  
should be a silent drop either.  I'm just about to push rev  
a71b546a834a4ac9561d57e9747e69312c1a6b80 which adds a warning when  
this happens.  Monotone now lets you know the name of the file (on the  
side of the merge where it hasn't been dropped), and lets you know the  
latest revisions with changes to the files content (the intersection  
of the content marks and the uncommon ancestors - Note that this isn't  
all revisions with changes to the file in the uncommon ancestors).   
Here is the output (taken from the new test case for this):

% cat merge\(\(patch_a\),_\(drop_a\)\)/stderr
mtn: 2 heads on branch 'testbranch'
mtn: [left]  34cb7cedfbff17f364b2afc3617f1bb3bdc5444c
mtn: [right] 6ac5c6416ef4d5f8d228d24e0f749e7014174564
mtn: warning: Content changes to the file "testfile"
mtn: warning: will be ignored during this merge as the file has been
mtn: warning: removed on one side of the merge.  Affected revisions  
include:
mtn: warning: Revision : 6ac5c6416ef4d5f8d228d24e0f749e7014174564
mtn: [merged] 7b1a7f23cf358f35491dee8fe256fe1418ee4fc1
mtn: note: your workspaces have not been updated
%

It's a relatively minor change, but I hope useful.

Be well,

Will         :-}