changeset 47558 | 811a79bfb8bb |
parent 47539 | 84391ddf4c78 |
child 47589 | f5c24c124e07 |
--- a/mercurial/dirstate.py Fri Jul 02 20:20:37 2021 +0200 +++ b/mercurial/dirstate.py Sun Jul 04 02:24:15 2021 +0200 @@ -536,7 +536,8 @@ if not self.in_merge: msg = _(b"setting %r to other parent only allowed in merges") % f raise error.Abort(msg) - if f in self and self[f] == b'n': + entry = self._map.get(f) + if entry is not None and entry.tracked: # merge-like self._addpath(f, merged=True) else: