Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 5227:466323968b23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid adding to the changelog executable files added by the second parent. This was a regression introduced by b51a8138292a.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 27 Aug 2007 14:21:04 -0300
parents 8ede77c2d008
children 8050f13772f6
line wrap: on
line diff
--- a/mercurial/localrepo.py	Mon Aug 27 01:44:35 2007 -0300
+++ b/mercurial/localrepo.py	Mon Aug 27 14:21:04 2007 -0300
@@ -718,7 +718,7 @@
                 new[f] = self.filecommit(f, m1, m2, linkrev, tr, changed)
                 new_exec = is_exec(f)
                 new_link = is_link(f)
-                if not changed or changed[-1] != f:
+                if (not changed or changed[-1] != f) and m2.get(f) != new[f]:
                     # mention the file in the changelog if some flag changed,
                     # even if there was no content change.
                     old_exec = m1.execf(f)