##// END OF EJS Templates
dirstate: ignore mode changes if the fs does not supports the exec bit...
Alexis S. L. Carvalho -
r6257:bfd49ce0 default
parent child Browse files
Show More
@@ -63,6 +63,9 b' class dirstate(object):'
63 63 elif name == '_slash':
64 64 self._slash = self._ui.configbool('ui', 'slash') and os.sep != '/'
65 65 return self._slash
66 elif name == '_checkexec':
67 self._checkexec = util.checkexec(self._root)
68 return self._checkexec
66 69 else:
67 70 raise AttributeError, name
68 71
@@ -578,8 +581,9 b' class dirstate(object):'
578 581 if type_ == 'n':
579 582 if not st:
580 583 st = lstat(_join(fn))
581 if (size >= 0 and (size != st.st_size
582 or (mode ^ st.st_mode) & 0100)
584 if (size >= 0 and
585 (size != st.st_size
586 or ((mode ^ st.st_mode) & 0100 and self._checkexec))
583 587 or size == -2
584 588 or fn in self._copymap):
585 589 madd(fn)
General Comments 0
You need to be logged in to leave comments. Login now