[MERGE] fix for a keyerror in finding least common ancestors

Aaron Bentley aaron.bentley at utoronto.ca
Tue Aug 7 16:33:46 BST 2007

Hash: SHA1

Michael Hudson wrote:
> Aaron Bentley wrote:
>> Can you please check out this branch, and let me know if it works for
>> your example?
>> http://code.aaronbentley.com/bzr/bzrrepo/bzr.ab
> It does, yes.  Thanks for the effort!

Okay, here's the merge request.  Since this is a bugfix, I would like to
land this for 0.19.

There was a bug in _filter_candidate_lca.

- - iterating the walker for A finds candidate B
- - candidate B was scheduled for iteration
- - candidate B has no ancestors other than NULL_REVISION

a KeyError would be thrown.

The scheduling of candidates is ordering-sensitive, but for the test
case, I think we have to assume that 'c' will sort before 'd'.  Either
that, or brew our own dict, an approach I have no appetite for.

>> (Yes, I hacked on bzr on my vacation.  In a cottage with no internet,
>> phone, electricity or running water)
> I'd be impressed anyway, but no electricity?  Quite an achievement :)

I could charge my battery by walking 10 minutes to another building.  It
was a bit like fetching water from a well.

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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix-lca-keyerror.patch
Type: text/x-patch
Size: 7562 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070807/b48d6cc0/attachment-0001.bin 

More information about the bazaar mailing list