Show More
@@ -442,10 +442,9 b' class dirstate(object):' | |||||
442 | break |
|
442 | break | |
443 | entry = self._map.get(d) |
|
443 | entry = self._map.get(d) | |
444 | if entry is not None and entry[0] != b'r': |
|
444 | if entry is not None and entry[0] != b'r': | |
445 | raise error.Abort( |
|
445 | msg = _(b'file %r in dirstate clashes with %r') | |
446 | _(b'file %r in dirstate clashes with %r') |
|
446 | msg %= (pycompat.bytestr(d), pycompat.bytestr(f)) | |
447 | % (pycompat.bytestr(d), pycompat.bytestr(f)) |
|
447 | raise error.Abort(msg) | |
448 | ) |
|
|||
449 | self._dirty = True |
|
448 | self._dirty = True | |
450 | self._updatedfiles.add(f) |
|
449 | self._updatedfiles.add(f) | |
451 | self._map.addfile(f, oldstate, state, mode, size, mtime) |
|
450 | self._map.addfile(f, oldstate, state, mode, size, mtime) |
General Comments 0
You need to be logged in to leave comments.
Login now