Mercurial > hg > mercurial-crew-with-dirclash

diff hgext/mq.py @ 4065:8ee983e3d461

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix strip'ping the second parent of a merge
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 06 Feb 2007 15:54:58 -0200
parents 6e0cb0790e23
children 5b1f663ef86d 785ad8cd1d31
line wrap: on
line diff
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -678,9 +678,10 @@ class queue:
             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: