Show More
@@ -446,6 +446,7 b' class dirstate(object):' | |||||
446 | size=NONNORMAL, |
|
446 | size=NONNORMAL, | |
447 | mtime=AMBIGUOUS_TIME, |
|
447 | mtime=AMBIGUOUS_TIME, | |
448 | from_p2=False, |
|
448 | from_p2=False, | |
|
449 | possibly_dirty=False, | |||
449 | ): |
|
450 | ): | |
450 | oldstate = self[f] |
|
451 | oldstate = self[f] | |
451 | if state == b'a' or oldstate == b'r': |
|
452 | if state == b'a' or oldstate == b'r': | |
@@ -466,6 +467,8 b' class dirstate(object):' | |||||
466 | if from_p2: |
|
467 | if from_p2: | |
467 | size = FROM_P2 |
|
468 | size = FROM_P2 | |
468 | mtime = AMBIGUOUS_TIME |
|
469 | mtime = AMBIGUOUS_TIME | |
|
470 | elif possibly_dirty: | |||
|
471 | mtime = AMBIGUOUS_TIME | |||
469 | else: |
|
472 | else: | |
470 | assert size != FROM_P2 |
|
473 | assert size != FROM_P2 | |
471 | if size != NONNORMAL: |
|
474 | if size != NONNORMAL: | |
@@ -522,7 +525,7 b' class dirstate(object):' | |||||
522 | return |
|
525 | return | |
523 | if entry[0] == b'm' or entry[0] == b'n' and entry[2] == FROM_P2: |
|
526 | if entry[0] == b'm' or entry[0] == b'n' and entry[2] == FROM_P2: | |
524 | return |
|
527 | return | |
525 | self._addpath(f, b'n', 0) |
|
528 | self._addpath(f, b'n', 0, possibly_dirty=True) | |
526 | self._map.copymap.pop(f, None) |
|
529 | self._map.copymap.pop(f, None) | |
527 |
|
530 | |||
528 | def otherparent(self, f): |
|
531 | def otherparent(self, f): |
General Comments 0
You need to be logged in to leave comments.
Login now