Show More
@@ -730,7 +730,7 b' class dirstate(object):' | |||||
730 | self._writedirstate, location='plain') |
|
730 | self._writedirstate, location='plain') | |
731 | return |
|
731 | return | |
732 |
|
732 | |||
733 | st = self._opener(filename, "w", atomictemp=True) |
|
733 | st = self._opener(filename, "w", atomictemp=True, checkambig=True) | |
734 | self._writedirstate(st) |
|
734 | self._writedirstate(st) | |
735 |
|
735 | |||
736 | def _writedirstate(self, st): |
|
736 | def _writedirstate(self, st): | |
@@ -1217,7 +1217,8 b' class dirstate(object):' | |||||
1217 | # use '_writedirstate' instead of 'write' to write changes certainly, |
|
1217 | # use '_writedirstate' instead of 'write' to write changes certainly, | |
1218 | # because the latter omits writing out if transaction is running. |
|
1218 | # because the latter omits writing out if transaction is running. | |
1219 | # output file will be used to create backup of dirstate at this point. |
|
1219 | # output file will be used to create backup of dirstate at this point. | |
1220 |
self._writedirstate(self._opener(filename, "w", atomictemp=True |
|
1220 | self._writedirstate(self._opener(filename, "w", atomictemp=True, | |
|
1221 | checkambig=True)) | |||
1221 |
|
1222 | |||
1222 | if tr: |
|
1223 | if tr: | |
1223 | # ensure that subsequent tr.writepending returns True for |
|
1224 | # ensure that subsequent tr.writepending returns True for |
General Comments 0
You need to be logged in to leave comments.
Login now