[Monotone-devel] Weird merge result in monotone.command-specific-options...

[Richard Levitte - VMS Whacker]

Hi,

in the branch net.venge.monotone.command-specific-options, something
weird happened during the last propagate from net.venge.monotone.  If
you look at the result (3df2e1d76aec27a233d09e92ba70df26f1dddc66), you
will see that it looks like both tests/t_update_inodeprints.at and
tests/t_refresh_inodeprints.at are added, each coming from one parent
revision.

The thing is, however, that one of the parent revisions
(e5b9010f189dc4e46892c3f5050db0b59f67aeb9) actually contains a rename
from tests/t_update_inodeprints.at to tests/t_refresh_inodeprints.at.
This seems to be completely ignored in the merge!

I'm guessing the merging algorithm lost track of the sequence of
events, so instead of having the sequence "file added; file renamed",
it seems to assume that the sequence of events is "file added; file
rename; another file with the same name added".

I'm not sure I understand the intricaties of the merge algorithm
enough to even start to figure this one out...

Cheers,
Richard

-----
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