git_handler: don't bail on multiple octopus merges in succession Consider two octopus merges, one of which is a child of the other. Without this patch, get_git_parents() called on the second octopus merge checks that each p1 is neither in the middle of an octopus merge nor the end of it. Since the end of the first octopus merge is a p1 of the second one, this asserts. Change the sanity check to only make sure that p1 is not in the middle of an octopus merge.

--- a/hggit/git_handler.py
+++ b/hggit/git_handler.py
@@ -529,7 +529,7 @@
             part = ctx
             while is_octopus_part(part):
                 (p1, p2) = part.parents()
-                assert not is_octopus_part(p1)
+                assert ctx.extra().get('hg-git', None) != 'octopus'
                 parents.append(p1)
                 part = p2
             parents.append(p2)