merge with stable

mercurial/commands.py

@@ -4278,9 +4278,8 b' def log(ui, repo, *pats, **opts):'
     .. note::
 
        for performance reasons, log FILE may omit duplicate changes
-       made on branches and will not show deletions. To see all
-       changes including duplicates and deletions, use the --removed
-       switch.
+       made on branches and will not show removals or mode changes. To
+       see all such changes, use the --removed switch.
 
     .. container:: verbose
 
@@ -4335,6 +4334,7 b' def log(ui, repo, *pats, **opts):'
     specifying custom templates.
 
     Returns 0 on success.
+
     """
     if opts.get('graph'):
         return cmdutil.graphlog(ui, repo, *pats, **opts)

mercurial/localrepo.py

@@ -1126,7 +1126,7 b' class localrepository(object):'
         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 b' class localrepository(object):'
         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

tests/test-changelog-exec.t

@@ -32,17 +32,19 b' manifest of p1:'
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
+  $ chmod +x foo
   $ hg ci -m 'merge'
 
-this should not mention bar:
+this should not mention bar but should mention foo:
 
   $ hg tip -v
-  changeset:   3:ef2fc9b4a51b
+  changeset:   3:c53d17ff3380
   tag:         tip
   parent:      2:ed1b79f46b9a
   parent:      1:d394a8db219b
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
+  files:       foo
   description:
   merge