Mercurial > public > mercurial-scm > hg-stable

diff mercurial/subrepo.py @ 14316:d5b525697ddb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extensions: drop maxlength from enabled and disabled This is a bad/silly API. Instead calculate maxlength in one place in help it's used and simplify all the callers.
author Matt Mackall <mpm@selenic.com>
date Fri, 13 May 2011 11:04:51 -0500
parents ba883fa211f3
children 25137d99a5ed
line wrap: on
line diff
--- a/mercurial/subrepo.py	Fri May 13 11:26:29 2011 +0200
+++ b/mercurial/subrepo.py	Fri May 13 11:04:51 2011 -0500
@@ -408,7 +408,7 @@
         if r == '' and not ignoreupdate: # no state recorded
             return True
         w = self._repo[None]
-        if r != w.p1().node() and not ignoreupdate:
+        if r != w.p1().hex() and not ignoreupdate:
             # different version checked out
             return True
         return w.dirty() # working directory changed