Mercurial > public > mercurial-scm > hg-stable

diff mercurial/dirstate.py @ 22897:8fe74328f700

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: merge falls through to otherparent This lets us more correctly fix the state when we use setparents, as demonstrated in the change in test-graft.t.
author Matt Mackall <mpm@selenic.com>
date Sat, 11 Oct 2014 14:05:09 -0500
parents 7e9cbb9c6053
children 509e2cbee679
line wrap: on
line diff
--- a/mercurial/dirstate.py	Fri Oct 10 13:31:06 2014 -0500
+++ b/mercurial/dirstate.py	Sat Oct 11 14:05:09 2014 -0500
@@ -451,11 +451,7 @@
         '''Mark a file merged.'''
         if self._pl[1] == nullid:
             return self.normallookup(f)
-        s = os.lstat(self._join(f))
-        self._addpath(f, 'm', s.st_mode,
-                      s.st_size & _rangemask, int(s.st_mtime) & _rangemask)
-        if f in self._copymap:
-            del self._copymap[f]
+        return self.otherparent(f)
 
     def drop(self, f):
         '''Drop a file from the dirstate'''