Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/localrepo.py @ 2846:35af2e56f15a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manifestflags: eliminate remaining users of direct dict access
author Matt Mackall <mpm@selenic.com>
date Wed, 19 Jul 2006 19:11:50 -0500
parents e196aa1df169
children e78cad1f6b1f
line wrap: on
line diff
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1792,7 +1792,7 @@ class localrepository(object):
                     # we need to reset the dirstate if the file was added
                     get[f] = m2[f]
 
-                if not s and mfw[f] != mf2[f]:
+                if not s and mfw.execf(f) != mf2.execf(f):
                     if force:
                         self.ui.debug(_(" updating permissions for %s\n") % f)
                         util.set_exec(self.wjoin(f), mf2.execf(f))