Comment 1 for bug 588698

Revision history for this message
Robert Collins (lifeless) wrote :

I've seen this in another situation too.

Here is what I think is happening; we search for a common merge base by assigning weights to common revisions; if we end up with two (or more) equally weighted revisions, we repeat this recursively.

And I think when we do this, and it hits the start of the branch when there are multiple tails, it blows up.

What it should do, there, is to go into criss-cross weave mode, or something.