[darcs-users] Multiple **** conflict markers

[Albert Reiner]

Hi,

not a problem, I'm just trying to understand darcs a little better
(using 1.0.3 (release)).

I am used to the

    v v v v v v v
    foo
    *************
    bar
    ^ ^ ^ ^ ^ ^ ^

style of conflict markers (with 2^1 different versions), and the
occasional

    v v v v v v v
    foobar
    ^ ^ ^ ^ ^ ^ ^

(with only 2^0 versions) when the conflicting patches agree that "foobar"
is correct.

A couple of hours ago, however, a pull just resulted in a first for
me: multiple **** markers (with 2^2 different versions):

    $ egrep 'v v v|\*\*\*|\^ \^ \^' nw/ar-soft-scoza.nw
    v v v v v v v
    *************
    *************
    *************
    ^ ^ ^ ^ ^ ^ ^
    ...

My interpretation (which seems to be consistent with the versions in
the file) is that there must be two pairs of conflicting patches
affecting overlapping sets of lines, and the four versions are
basically the direct product of all possibilities of reconciling those
patches.  Is that correct?

Anyway, at first I was a bit worried when pulling took longer than
usual; and then I was very much delighted at the result darcs produced.
Thanks for a great tool!

Albert.