changeset 47991 | 625b84c1abdd |
parent 47990 | 0d2a404f1932 |
child 47992 | 14fa2e583422 |
--- a/mercurial/dirstate.py Wed Sep 15 18:05:39 2021 +0200 +++ b/mercurial/dirstate.py Wed Sep 15 18:16:16 2021 +0200 @@ -401,7 +401,12 @@ source = self._map.copymap.get(f) if source: copies[f] = source - self._normallookup(f) + self._map.reset_state( + f, + wc_tracked=True, + p1_tracked=True, + possibly_dirty=True, + ) # Also fix up otherparent markers elif s.from_p2: source = self._map.copymap.get(f)