mercurial/localrepo.py

2833:d0159c5f18bf

                elif f in umap or f in added:
                    # this unknown file is the same as the checkout
                    # we need to reset the dirstate if the file was added
                    get[f] = m2[f]

                if not s and mfw[f] != mf2[f]:
                    if force:
                        self.ui.debug(_(" updating permissions for %s\n") % f)
                        util.set_exec(self.wjoin(f), mf2.execf(f))
                    else:
                        a, b, c = mfa.execf(f), mfw.execf(f), mf2.execf(f)

2834:35af2e56f15a

                elif f in umap or f in added:
                    # this unknown file is the same as the checkout
                    # we need to reset the dirstate if the file was added
                    get[f] = m2[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))
                    else:
                        a, b, c = mfa.execf(f), mfw.execf(f), mf2.execf(f)