# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1448067301 28800
# Node ID e2b79f57903a57d754978ead5639fac5b5694e15
# Parent  98fc58378a3fa307e252c11d7dc4fbf36bf32651
mergestate: add a way to record pending dirstate actions

We're going to use this in resolve in the next patch.

diff -r 98fc58378a3f -r e2b79f57903a mercurial/merge.py
--- a/mercurial/merge.py	Sun Nov 15 21:55:46 2015 -0800
+++ b/mercurial/merge.py	Fri Nov 20 16:55:01 2015 -0800
@@ -517,6 +517,11 @@
                 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