[PATCH] more work on merge

[John A Meinel]

Aaron Bentley wrote:

> I've been working on computing the most recent common ancestor out of
> all ancestors, but it's taking a while to get right.

Did you see my work in the merge plugin? Is there a reason my method was
not correct? Perhaps it was just too slow. My method was to get the list
of all revisions in the TO branch, and then search breadth-first into
the FROM branch until I found a revision which existed in both.

I know there was discussion about "slightly preferring mainline", but
other than fuzzy weighting, etc, I'm not sure how to implement that.

>
> Aaron

Mostly I'm just curious if there is something wrong about my merge code.
Some case that you know about that it would miss, etc.

John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050709/7f189ce8/attachment.pgp