diff hgext/mq.py @ 4065:8ee983e3d461

fix strip'ping the second parent of a merge

--- a/hgext/mq.py	Tue Feb 06 15:43:01 2007 -0200
+++ b/hgext/mq.py	Tue Feb 06 15:54:58 2007 -0200
@@ -678,9 +678,10 @@
             while True:
                 seen[n] = 1
                 pp = chlog.parents(n)
-                if pp[1] != revlog.nullid and chlog.rev(pp[1]) > revnum:
-                    if pp[1] not in seen:
-                        heads.append(pp[1])
+                if pp[1] != revlog.nullid:
+                    for p in pp:
+                        if chlog.rev(p) > revnum and p not in seen:
+                            heads.append(p)
                 if pp[0] == revlog.nullid:
                     break
                 if chlog.rev(pp[0]) < revnum: