[Monotone-devel] merge weirdness...

[Richard Levitte - VMS Whacker]

Hi,

I've done quite a few merges and propagates from net.venge.monotone to
net.venge.monotone.command-specific-options in the last few days, and
found it a bit weird that the propagate (and lately, the merge) seemed
to try to reapply exactly the same changes from one time to the other.

So this time, I payed a bit more attention to the information that
monotone gives me...:

  : ; monotone propagate net.venge.monotone 
net.venge.monotone.command-specific-options 
  monotone: propagating net.venge.monotone -> 
net.venge.monotone.command-specific-options
  monotone: [source] f188f1efa53fc5e1f7aa1313f5d5af8577a0dac9
  monotone: [target] f0ab92b1b5adc27e597b71d7efaef3f704488fe1
  monotone: common ancestor cdb64688be75821fe5e8187e8ca815cba25d4e85 found
  [...]
  
  : ; monotone merge --branch=net.venge.monotone
  monotone: starting with revision 1 / 2
  monotone: merging with revision 2 / 2
  monotone: [source] 9af135841f7eeb128f4d02d533f5797b3a6a5289
  monotone: [source] f188f1efa53fc5e1f7aa1313f5d5af8577a0dac9
  monotone: common ancestor cdb64688be75821fe5e8187e8ca815cba25d4e85 found
  [...]
  monotone: [merged] 19342b164e493e3da5de22985e38d9c94a664dcd
  
  : ; monotone propagate net.venge.monotone 
net.venge.monotone.command-specific-options 
  monotone: propagating net.venge.monotone -> 
net.venge.monotone.command-specific-options
  monotone: [source] 19342b164e493e3da5de22985e38d9c94a664dcd
  monotone: [target] b34d090b64d6a6c48db0583bc210b448142674d4
  monotone: common ancestor cdb64688be75821fe5e8187e8ca815cba25d4e85 found
  [..]


Notice how they all use the same common ancestor...

  : ; monotone log --depth=1 cdb64688be75821fe5e8187e8ca815cba25d4e85
  -----------------------------------------------------------------
  Revision: cdb64688be75821fe5e8187e8ca815cba25d4e85
  Ancestor: 9b5c492d6e0e2e6c65e915b702fdc4cf7451b348
  Ancestor: ac6c497bb7a37568774f27c28ff68f6be5c1a07e
  Author: address@hidden
  Date: 2005-04-08T19:35:10
  Branch: net.venge.monotone
  
  Added files:
          tests/t_inodeprints.at tests/t_inodeprints_update.at
  Modified files:
          ChangeLog UPGRADE commands.cc inodeprint.cc inodeprint.hh
          manifest.cc manifest.hh
          tests/t_automate_ancestry_difference.at
          tests/t_automate_descendents.at
          tests/t_automate_erase_ancestors.at
          tests/t_automate_toposort.at tests/t_cat_file_by_name.at
          tests/t_empty_env.at tests/t_netsync_absorbs.at
          tests/t_vars.at testsuite.at win32/inodeprint.cc work.cc
          work.hh
  
  ChangeLog: 
  
  merge of 9b5c492d6e0e2e6c65e915b702fdc4cf7451b348
       and ac6c497bb7a37568774f27c28ff68f6be5c1a07e


Wow!  With such an old ancestor, I suddenly understand why monotone
keeps on running into the same conflicts time and time again.

For some reason, I would say that the last propagate should have
chosen f188f1efa53fc5e1f7aa1313f5d5af8577a0dac9 for a common ancestor.

Maybe I've misunderstood what it means to have common ancestor.  I'm
just pretty sure that it would have been just as correct, and would
have had much fewer conflicts or repeated changes.

Funny thing is, 'monotone lca' seems to get it right:

  : ; monotone lca 19342b164e493e3da5de22985e38d9c94a664dcd 
b34d090b64d6a6c48db0583bc210b448142674d4
  f188f1efa53fc5e1f7aa1313f5d5af8577a0dac9

Comments?

-----
Please consider sponsoring my work on free software.
See http://www.free.lp.se/sponsoring.html for details.

-- 
Richard Levitte                         address@hidden
                                        http://richard.levitte.org/

"When I became a man I put away childish things, including
 the fear of childishness and the desire to be very grown up."
                                                -- C.S. Lewis