Mercurial > public > mercurial-scm > hg-stable

diff hgext/mq.py @ 3578:3b4e00cba57a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Define and use nullrev (revision of nullid) instead of -1.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 29 Oct 2006 10:53:51 +0100
parents 23f7d9621783
children 437489d8dfbf
line wrap: on
line diff
--- a/hgext/mq.py	Sat Oct 28 23:37:59 2006 -0300
+++ b/hgext/mq.py	Sun Oct 29 10:53:51 2006 +0100
@@ -1310,7 +1310,7 @@
             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')