Read about our upcoming Code of Conduct on this issue

Commit 7b0a308e authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

mergestate: add a way to record pending dirstate actions

We're going to use this in resolve in the next patch.
parent 98fc58378a3f
......@@ -517,6 +517,11 @@ class mergestate(object):
actions[action].append((f, None, "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)
def _checkunknownfile(repo, wctx, mctx, f, f2=None):
if f2 is None:
f2 = f
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment