equal
deleted
inserted
replaced
754 for f, (r, action) in pycompat.iteritems(self._results): |
754 for f, (r, action) in pycompat.iteritems(self._results): |
755 if action is not None: |
755 if action is not None: |
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 |
767 Meant for use by custom merge drivers.""" |
762 Meant for use by custom merge drivers.""" |
768 self._results[f] = 0, ACTION_REMOVE |
763 self._results[f] = 0, ACTION_REMOVE |