Submitter | Katsunori FUJIWARA |
---|---|
Date | Nov. 12, 2016, 9:16 p.m. |
Message ID | <bff5ccbe5ead56aac7ff.1478985369@feefifofum> |
Download | mbox | patch |
Permalink | /patch/17528/ |
State | Accepted |
Delegated to: | Yuya Nishihara |
Headers | show |
Comments
Patch
diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py --- a/mercurial/scmutil.py +++ b/mercurial/scmutil.py @@ -390,8 +390,7 @@ class abstractvfs(object): newstat = util.filestat(dstpath) if newstat.isambig(oldstat): # stat of renamed file is ambiguous to original one - advanced = (oldstat.stat.st_mtime + 1) & 0x7fffffff - os.utime(dstpath, (advanced, advanced)) + newstat.avoidambig(dstpath, oldstat) return ret return util.rename(self.join(src), dstpath)