##// END OF EJS Templates
dirstate: make restoring from backup avoid ambiguity of file stat...
FUJIWARA Katsunori -
r29351:bebe7d1c default
parent child Browse files
Show More
@@ -1243,7 +1243,8 b' class dirstate(object):'
1243 self.invalidate()
1243 self.invalidate()
1244 filename = self._actualfilename(tr)
1244 filename = self._actualfilename(tr)
1245 # using self._filename to avoid having "pending" in the backup filename
1245 # using self._filename to avoid having "pending" in the backup filename
1246 self._opener.rename(prefix + self._filename + suffix, filename)
1246 self._opener.rename(prefix + self._filename + suffix, filename,
1247 checkambig=True)
1247
1248
1248 def clearbackup(self, tr, suffix='', prefix=''):
1249 def clearbackup(self, tr, suffix='', prefix=''):
1249 '''Clear backup file with suffix'''
1250 '''Clear backup file with suffix'''
General Comments 0
You need to be logged in to leave comments. Login now