Bad merge base selection

Aaron Bentley aaron.bentley at utoronto.ca
Sat Sep 17 01:42:19 BST 2005


On Fri, Sep 16, 2005 at 10:06:44AM -0400, John A Meinel wrote:
> After merging my
> old bzr-split-storage into the current integration branch, and creating
> "bzr-split-storage-2", I am once again getting the permanent merge base
> as revision 851.

This is happening because the complete bzr tree has two root nodes;
thre is a revision committed by Martin whose revision-id ends with eeae
(sorry to be vague, I have to boot windows to use my modem).

This revision has no parents, which makes it a second root node.
My code assumes there's only one root node.
I'll fix it by using the null revision as the root of every graph,
unless someone has a better idea.

Aaron
-- 
Aaron Bentley
www.aaronbentley.com




More information about the bazaar mailing list