changeset 47673 | 37825a85d3b0 |
parent 47671 | 20f366db3e5f |
child 47674 | ff97e793ed36 |
--- a/mercurial/dirstate.py Wed Jul 14 23:32:35 2021 +0200 +++ b/mercurial/dirstate.py Thu Jul 15 17:24:09 2021 +0200 @@ -567,8 +567,7 @@ self._drop(filename) elif merged: assert wc_tracked - if not self.in_merge: - self.normallookup(filename) + assert self.in_merge # we are never in the "normallookup" case self.otherparent(filename) elif not (p1_tracked or p2_tracked) and wc_tracked: self._addpath(filename, added=True, possibly_dirty=possibly_dirty)