Re: [Monotone-devel] Status update

[Joel Rosdahl]

Nathaniel Smith <address@hidden> writes:

> [...]
>   - Currently there are two heads for .changesets, the ones from me
>     and from Joel; excitingly, this is our first real criss-cross
>     merge! Unfortunately, what this means in practice is that
>     merging is really annoying, because the common ancestor chosen
>     is sufficiently high up that one has to merge ~280 conflicts in
>     documentation tweaks by hand. Well, at least that's what ediff
>     claims; ediff also gets out of synch and starts giving huge
>     spurious conflicts, though, so another tool might do better, I
>     dunno. I am wondering though if this means it's time to add a
>     'monotone merge [left right [ancestor]]' command, and whether
>     that would help...

When I tried to merge the two heads in question [1][2], Monotone
selected an older ancestor [3] than the least common ancestor [4] (if
I'm not mistaken; my discrete math is a bit rusty). I assume this is
because of the reasoning in the comment at the top of revision.cc.
Nevertheless, I wanted to see of the ediff merge would be easier when
using [4] as a reference, so I crudely extended the merge command as
mentioned above and tried the merge. Result: It was not trivial, but
much less painful (in Emacs ediff, at least). I committed the merge as
[5] to my server, should anyone want to look at it.

An interesting thing that happened when merging was that the automated
merge of database.cc made a row with a closing function brace
disappear. I don't know if it's a bug in the merge algorithm or just
an expected consequence of the inputs, but someone else maybe can
figure that out.

[1] ded2640871559a50e9087ef5898a5a30dda37ef2
[2] afd8949c922f17ddbdc769b7d07590668e49488e
[3] 628ad53fc11a557140f432ce804cae8aed0afb96
[4] 631e8f001ec1a7b21f8ff379a6c88e7fae394982
[5] e2661a10eb459e6e65dc1ec1463fe0a56565322a

        Regards,
        Joel

-- 
Joel Rosdahl <address@hidden>
Key BB845E97; fingerprint 9F4B D780 6EF4 5700 778D  8B22 0064 F9FF BB84 5E97