changeset 14312 | ba883fa211f3 |
parent 14281 | ccb7240acf32 |
child 14316 | d5b525697ddb |
--- a/mercurial/subrepo.py Thu May 12 20:27:35 2011 +0200 +++ b/mercurial/subrepo.py Thu May 12 18:35:04 2011 -0500 @@ -408,7 +408,7 @@ if r == '' and not ignoreupdate: # no state recorded return True w = self._repo[None] - if w.p1() != self._repo[r] and not ignoreupdate: + if r != w.p1().node() and not ignoreupdate: # different version checked out return True return w.dirty() # working directory changed