mercurial/scmutil.py
branchstable
changeset 30321 e0ff47999b13
parent 30320 bff5ccbe5ead
child 30417 854190becacb
equal deleted inserted replaced
30320:bff5ccbe5ead 30321:e0ff47999b13
  1455         oldstat = self._oldstat
  1455         oldstat = self._oldstat
  1456         if oldstat.stat:
  1456         if oldstat.stat:
  1457             newstat = util.filestat(self._origfh.name)
  1457             newstat = util.filestat(self._origfh.name)
  1458             if newstat.isambig(oldstat):
  1458             if newstat.isambig(oldstat):
  1459                 # stat of changed file is ambiguous to original one
  1459                 # stat of changed file is ambiguous to original one
  1460                 advanced = (oldstat.stat.st_mtime + 1) & 0x7fffffff
  1460                 newstat.avoidambig(self._origfh.name, oldstat)
  1461                 os.utime(self._origfh.name, (advanced, advanced))
       
  1462 
  1461 
  1463     def __exit__(self, exc_type, exc_value, exc_tb):
  1462     def __exit__(self, exc_type, exc_value, exc_tb):
  1464         self._origfh.__exit__(exc_type, exc_value, exc_tb)
  1463         self._origfh.__exit__(exc_type, exc_value, exc_tb)
  1465         self._checkambig()
  1464         self._checkambig()
  1466 
  1465