Show More
@@ -1187,7 +1187,11 b' class dirstate(object):' | |||
|
1187 | 1187 | # changes of dirstate out after restoring from backup file |
|
1188 | 1188 | self.invalidate() |
|
1189 | 1189 | filename = self._actualfilename(tr) |
|
1190 | self._opener.rename(backupname, filename, checkambig=True) | |
|
1190 | o = self._opener | |
|
1191 | if util.samefile(o.join(backupname), o.join(filename)): | |
|
1192 | o.unlink(backupname) | |
|
1193 | else: | |
|
1194 | o.rename(backupname, filename, checkambig=True) | |
|
1191 | 1195 | |
|
1192 | 1196 | def clearbackup(self, tr, backupname): |
|
1193 | 1197 | '''Clear backup file''' |
General Comments 0
You need to be logged in to leave comments.
Login now