[MERGE] GraphWalker and new base selection algorithm

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,

This patch both improves the speed of merge-base selection, and improves
its behavior with criss-cross merges.

In terms of speed, I've only improved the constant factors so far.  But
merely improving the constant factors changes my merge time on bzr.dev
from 12 seconds to 4 seconds.

A reimplementation of the minimal_common could conceivably scale with
the number of uncommon ancestors, and I plan to do so.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGV9KR0F+nu1YWqI0RAgoiAJ95P9A2PB4s4izE6CQYJEfEVJzh0wCePwzV
KIXpn1LFyUA2zWfwQR+jpq4=
=czqg
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: graph-walker.patch
Type: text/x-patch
Size: 58324 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070526/742120e9/attachment-0001.bin