Mercurial > hg > mercurial-crew-with-dirclash
diff hgext/mq.py @ 4068:5b1f663ef86d
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 06 Feb 2007 16:12:22 -0600 |
parents | 5d6b3fa62736 8ee983e3d461 |
children | 165abe554c80 |
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: