Show More
@@ -455,6 +455,10 b' class dirstate(object):' | |||||
455 | msg = _(b'file %r in dirstate clashes with %r') |
|
455 | msg = _(b'file %r in dirstate clashes with %r') | |
456 | msg %= (pycompat.bytestr(d), pycompat.bytestr(f)) |
|
456 | msg %= (pycompat.bytestr(d), pycompat.bytestr(f)) | |
457 | raise error.Abort(msg) |
|
457 | raise error.Abort(msg) | |
|
458 | if size != NONNORMAL and size != FROM_P2: | |||
|
459 | size = size & _rangemask | |||
|
460 | if mtime != AMBIGUOUS_TIME: | |||
|
461 | mtime = mtime & _rangemask | |||
458 | self._dirty = True |
|
462 | self._dirty = True | |
459 | self._updatedfiles.add(f) |
|
463 | self._updatedfiles.add(f) | |
460 | self._map.addfile(f, oldstate, state, mode, size, mtime) |
|
464 | self._map.addfile(f, oldstate, state, mode, size, mtime) | |
@@ -476,7 +480,7 b' class dirstate(object):' | |||||
476 | mode = s.st_mode |
|
480 | mode = s.st_mode | |
477 | size = s.st_size |
|
481 | size = s.st_size | |
478 | mtime = s[stat.ST_MTIME] |
|
482 | mtime = s[stat.ST_MTIME] | |
479 |
self._addpath(f, b'n', mode, size |
|
483 | self._addpath(f, b'n', mode, size, mtime) | |
480 | self._map.copymap.pop(f, None) |
|
484 | self._map.copymap.pop(f, None) | |
481 | if f in self._map.nonnormalset: |
|
485 | if f in self._map.nonnormalset: | |
482 | self._map.nonnormalset.remove(f) |
|
486 | self._map.nonnormalset.remove(f) |
General Comments 0
You need to be logged in to leave comments.
Login now