Mercurial > public > mercurial-scm > hg

diff mercurial/localrepo.py @ 22502:e6e7ef68c879

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 22 Sep 2014 16:14:08 -0500
parents 6f63c47cbb86 d5261db0011f
children cda85cfc8252
line wrap: on
line diff
--- a/mercurial/localrepo.py	Mon Sep 22 16:03:07 2014 -0500
+++ b/mercurial/localrepo.py	Mon Sep 22 16:14:08 2014 -0500
@@ -1126,7 +1126,7 @@
         text = fctx.data()
         flog = self.file(fname)
         fparent1 = manifest1.get(fname, nullid)
-        fparent2 = fparent2o = manifest2.get(fname, nullid)
+        fparent2 = manifest2.get(fname, nullid)
 
         meta = {}
         copy = fctx.renamed()
@@ -1192,9 +1192,8 @@
         if fparent2 != nullid or flog.cmp(fparent1, text) or meta:
             changelist.append(fname)
             return flog.add(text, meta, tr, linkrev, fparent1, fparent2)
-
         # are just the flags changed during merge?
-        if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags():
+        elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():
             changelist.append(fname)
 
         return fparent1