[PATCH] more work on merge

[Aaron Bentley]

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

This work is textually, but not logically, dependent on my previous
"Updates for faster local branching" patches.

is_ancestor

Added an is_ancestor function, which is necessary for getting merge to
call add_pending_merge() when BASE is specified.

This patch also causes ImmutableStore and RevisionStore to raise
KeyError when they encounter missing store-ids.

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

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

iD8DBQFC0HrC0F+nu1YWqI0RAuAPAJ9csCwgvAIYlTE5KvFJsAHLoyYq6ACeJZZV
707DabqF/bfwxuLpg+SfczQ=
=w467
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: is_ancestor.patch
Type: text/x-patch
Size: 7509 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050709/769db15b/attachment.bin