Submitter | Katsunori FUJIWARA |
---|---|
Date | Nov. 12, 2016, 9:16 p.m. |
Message ID | <e0ff47999b1384e42bdc.1478985370@feefifofum> |
Download | mbox | patch |
Permalink | /patch/17526/ |
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 @@ -1457,8 +1457,7 @@ class checkambigatclosing(closewrapbase) newstat = util.filestat(self._origfh.name) if newstat.isambig(oldstat): # stat of changed file is ambiguous to original one - advanced = (oldstat.stat.st_mtime + 1) & 0x7fffffff - os.utime(self._origfh.name, (advanced, advanced)) + newstat.avoidambig(self._origfh.name, oldstat) def __exit__(self, exc_type, exc_value, exc_tb): self._origfh.__exit__(exc_type, exc_value, exc_tb)