Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 4997:60c54154ec4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: don't forget to update the dirstate for exec bit changes
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Jul 2007 11:19:53 -0500
parents 931f901ab811
children 54ff1bb4b53a f191bc3916f7
line wrap: on
line diff
--- a/mercurial/merge.py	Sat Jul 21 19:07:18 2007 -0700
+++ b/mercurial/merge.py	Thu Jul 26 11:19:53 2007 -0500
@@ -452,7 +452,7 @@
                 repo.dirstate.forget([f])
         elif m == "f": # forget
             repo.dirstate.forget([f])
-        elif m == "g": # get
+        elif m in "ge": # get or exec change
             if branchmerge:
                 repo.dirstate.update([f], 'n', st_mtime=-1)
             else: