Re: The new Codeville merge algorithm

Petr Baudis wrote:

> This sounds quite unsettling. I'm rather conservative on merges, and
> this sounds dangerous on its own. There is just a huge amount of cases
> when this decision is wrong. Let's take these perl snippets:
>
>       $foo = "abcd";          $foo = "abcd";
>       if ($foo eq 'abcd')     if ($foo eq "abcd")
>               { exit }                { exit }
>
> Then if I understand you correctly, the merge would generate
>
>       $foo = "abcd";
>       if ($foo eq 'abcd')
>       if ($foo eq "abcd")
>               { exit }

That is incorrect. The line ordering you've given is the weave, which is
the *potential* line order, but doing the merge will generate something
like the following:

$foo = "abcd";
<<<<<
if ($foo eq 'abcd')
=====
if ($foo eq "abcd")
>>>>>
           { exit }


The user can then manually edit the lines to be in mash-up order, but it
doesn't happen automatically. The system is very conservative about giving
conflicts when they happen.

> I think you are just being way too liberal here, by allowing aXYb. It
> would be much more reasonable to just disallow this case and make it a
> conflict.

My point about aXYb is that it *can* happen, although it doesn't get
merged together by default.

-Bram