Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 7569:89207edf3973

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correctly update dirstate after update+mode change (issue1456)
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 07 Jan 2009 02:11:17 +0100
parents 865c5be0f8df
children 4dd7b28003d2 a679bd371091
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Jan 06 10:30:22 2009 +0100
+++ b/mercurial/merge.py	Wed Jan 07 02:11:17 2009 +0100
@@ -369,7 +369,9 @@
                 repo.dirstate.forget(f)
         elif m == "f": # forget
             repo.dirstate.forget(f)
-        elif m in "ge": # get or exec change
+        elif m == "e": # exec change
+            repo.dirstate.normaldirty(f)
+        elif m == "g": # get
             if branchmerge:
                 repo.dirstate.normaldirty(f)
             else: