diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -6129,7 +6129,8 @@ raise ms.commit() - ms.recordactions() + branchmerge = repo.dirstate.p2() != nullid + mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None) if not didwork and pats: hint = None diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py --- a/mercurial/mergestate.py +++ b/mercurial/mergestate.py @@ -756,11 +756,6 @@ actions[action].append((f, None, b"merge result")) return actions - def recordactions(self): - """record remove/add/get actions in the dirstate""" - branchmerge = self._repo.dirstate.p2() != nullid - recordupdates(self._repo, self.actions(), branchmerge, None) - def queueremove(self, f): """queues a file to be removed from the dirstate