equal
deleted
inserted
replaced
1790 elif f in umap or f in added: |
1790 elif f in umap or f in added: |
1791 # this unknown file is the same as the checkout |
1791 # this unknown file is the same as the checkout |
1792 # we need to reset the dirstate if the file was added |
1792 # we need to reset the dirstate if the file was added |
1793 get[f] = m2[f] |
1793 get[f] = m2[f] |
1794 |
1794 |
1795 if not s and mfw[f] != mf2[f]: |
1795 if not s and mfw.execf(f) != mf2.execf(f): |
1796 if force: |
1796 if force: |
1797 self.ui.debug(_(" updating permissions for %s\n") % f) |
1797 self.ui.debug(_(" updating permissions for %s\n") % f) |
1798 util.set_exec(self.wjoin(f), mf2.execf(f)) |
1798 util.set_exec(self.wjoin(f), mf2.execf(f)) |
1799 else: |
1799 else: |
1800 a, b, c = mfa.execf(f), mfw.execf(f), mf2.execf(f) |
1800 a, b, c = mfa.execf(f), mfw.execf(f), mf2.execf(f) |