Comment 2 for bug 483388
Revision history for this message
| Matthew Fuller (fullermd) wrote Re: [Bug 483388] Re: merge lies about lacking common ancestors | #2 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
bbfa235
(Get the code!)
> This appears to be a criss-cross, but of two revisions that have no
> parents (other than null:).
In this repro script, the two branches share 2 common initial
revisions. In the actual case I ran into it, the branches had 2 and 3
(respectively) initial revs, with 2 of them being common, and for the
branch with 3 initials, the leftmost initial rev was the uncommon one.
But I don't believe either the extra uncommon path or the chirality
matters.