diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py index 51cd60c0a34516b1bf52dc831c57b77b3780efdd_bWVyY3VyaWFsL2RpcnN0YXRlLnB5..65e3d8028f2e07b77a6c56881a40805cdbba08e6_bWVyY3VyaWFsL2RpcnN0YXRlLnB5 100644 --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -733,7 +733,7 @@ if entry.merged_removed or entry.from_p2_removed: source = self._map.copymap.get(f) if entry.merged_removed: - self._merge(f) + self._otherparent(f) elif entry.from_p2_removed: self._otherparent(f) if source is not None: @@ -762,11 +762,6 @@ self._addpath(filename, added=True) self._map.copymap.pop(filename, None) - def _merge(self, f): - if not self.in_merge: - return self._normallookup(f) - return self._otherparent(f) - def _drop(self, filename): """internal function to drop a file from the dirstate""" if self._map.dropfile(filename):