changeset 3578 | 3b4e00cba57a |
parent 3568 | 23f7d9621783 |
child 3604 | 437489d8dfbf |
--- a/hgext/mq.py +++ b/hgext/mq.py @@ -1310,7 +1310,7 @@ class queue: for r in rev: p1, p2 = repo.changelog.parentrevs(r) n = repo.changelog.node(r) - if p2 != -1: + if p2 != revlog.nullrev: raise util.Abort(_('cannot import merge revision %d') % r) if lastparent and lastparent != r: raise util.Abort(_('revision %d is not the parent of %d')