bzr rebase: graph.find_unique_lca(*[oldparents[0],newparents[1]]) !??

[Max Bowsher]

I was puzzling over erroneous conflicts during a rebase, and have
tracked the cause to

         return graph.find_unique_lca(*[oldparents[0],newparents[1]])

in replay_determine_base.


Can anyone elucidate what this code is trying to do? When is finding a
common ancestor spanning the old and new branches of a rebase the right
thing to do? It's definitely not right in my scenario.

Max.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20091122/9cebad77/attachment.pgp