diff -r b496a464399c -r bff5ccbe5ead mercurial/scmutil.py
--- a/mercurial/scmutil.py	Sun Nov 13 06:06:23 2016 +0900
+++ b/mercurial/scmutil.py	Sun Nov 13 06:11:56 2016 +0900
@@ -390,8 +390,7 @@
             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)