changeset 47529 | d3cf20328abd |
parent 47528 | 80617f3c0f9a |
child 47530 | a1745a292885 |
--- a/mercurial/dirstate.py Sun Jul 04 01:57:28 2021 +0200 +++ b/mercurial/dirstate.py Sun Jul 04 01:58:03 2021 +0200 @@ -543,7 +543,7 @@ self._addpath(f, merged=True) else: # add-like - self._addpath(f, b'n', 0, from_p2=True) + self._addpath(f, from_p2=True) self._map.copymap.pop(f, None) def add(self, f):