changeset 48066 | 7a2de2bd9fcd |
parent 48065 | 870100c0209b |
child 48067 | d3eb5f50052c |
--- a/mercurial/pure/parsers.py Tue Sep 28 19:15:46 2021 +0200 +++ b/mercurial/pure/parsers.py Tue Sep 28 19:29:44 2021 +0200 @@ -379,7 +379,7 @@ raise RuntimeError('untracked item') elif self.removed and self._merged: return NONNORMAL - elif self.from_p2_removed: + elif self.removed and self._clean_p2: return FROM_P2 elif self.removed: return 0