Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/subrepo.py
branchstable
changeset 13428 5ef29e0dd418
parent 13417 0748e18be470
child 13432 5a5bd7614401 
--- a/mercurial/subrepo.py	Wed Feb 16 14:13:22 2011 -0600
+++ b/mercurial/subrepo.py	Wed Feb 16 11:53:48 2011 -0600
@@ -886,7 +886,7 @@
         if self.dirty():
             if self._gitstate() != revision:
                 dirty = self._gitstate() == self._state[1] or code != 0
-                if _updateprompt(self._ui, self, dirty, self._state[1], revision):
+                if _updateprompt(self._ui, self, dirty, self._state[1][:7], revision[:7]):
                     mergefunc()
         else:
             mergefunc()
Mercurial