##// END OF EJS Templates
mergestate: remove unnecessary recordactions() from mergestate class...
Pulkit Goyal -
r45724:7f41e824 default
parent child Browse files
Show More
@@ -6129,7 +6129,8 b' def resolve(ui, repo, *pats, **opts):'
6129 raise
6129 raise
6130
6130
6131 ms.commit()
6131 ms.commit()
6132 ms.recordactions()
6132 branchmerge = repo.dirstate.p2() != nullid
6133 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6133
6134
6134 if not didwork and pats:
6135 if not didwork and pats:
6135 hint = None
6136 hint = None
@@ -756,11 +756,6 b' class mergestate(object):'
756 actions[action].append((f, None, b"merge result"))
756 actions[action].append((f, None, b"merge result"))
757 return actions
757 return actions
758
758
759 def recordactions(self):
760 """record remove/add/get actions in the dirstate"""
761 branchmerge = self._repo.dirstate.p2() != nullid
762 recordupdates(self._repo, self.actions(), branchmerge, None)
763
764 def queueremove(self, f):
759 def queueremove(self, f):
765 """queues a file to be removed from the dirstate
760 """queues a file to be removed from the dirstate
766
761
General Comments 0
You need to be logged in to leave comments. Login now