changeset 45164 | 7f41e824a02b |
parent 45163 | f69253935bf8 |
child 45165 | 01c4dccfd6b5 |
--- a/mercurial/mergestate.py Thu Jul 09 17:05:41 2020 +0530 +++ b/mercurial/mergestate.py Thu Jul 09 18:20:54 2020 +0530 @@ -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