star or parallele merge

[David Allouche]

On Wed, 2005-10-05 at 09:39 +0200, Jan Hudec wrote:
> That worked like this in bazaar, but in bazaar-ng, which has mutliple
> revision parents, it works a bit differently. Because now a changeset
> never /inludes/ other changesets, but rather has them as parents.
> 
> So in your case above rev. B10 would have parents B9 and A33 and if you
> already have A33, it would only apply whatever is in B10 that is not in
> A33. However since you also have B9, diff3 does not cut it, which is one
> of the reasons why the weaves were introduced -- to allow implementing
> linewise mergre (which was prototyped in codeville).

I'm not sure what you mean by "linewise merge" if you mean just plain
"simple weave merge", it has at least one documented silent failure mode
that make it unacceptable for me.

http://revctrl.org/CrissCrossMerge

If you are talking about something smarter, I'd like you to be more
specific.

The bottom line is that, in my understanding, merging is largely an
unsolved problem with nasty yet relatively common edge cases, so good
diagnostic facilities are required.
-- 
                                                            -- ddaa
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051005/7722986f/attachment.pgp