# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1448064502 28800
# Node ID 78b0c88ab0dbaad6d3cbbaf5a6548c3d03ae1db3
# Parent  b9fc042168a44cc3ecf2c2cc595e08fb327d3c8b
mergestate._resolve: store return code and action for each file

We're going to need this to compute (a) updated/merged/unresolved counts, and
(b) actions to perform on the dirstate.

diff -r b9fc042168a4 -r 78b0c88ab0db mercurial/merge.py
--- a/mercurial/merge.py	Sat Nov 21 15:43:04 2015 -0800
+++ b/mercurial/merge.py	Fri Nov 20 16:08:22 2015 -0800
@@ -114,6 +114,7 @@
         else:
             self._mdstate = 'u'
         shutil.rmtree(self._repo.join('merge'), True)
+        self._results = {}
         self._dirty = False
 
     def _read(self):
@@ -150,6 +151,7 @@
                 self._state[bits[0]] = bits[1:]
             elif not rtype.islower():
                 unsupported.add(rtype)
+        self._results = {}
         self._dirty = False
 
         if unsupported:
@@ -466,6 +468,7 @@
                 elif fco.isabsent(): # cd: local picked
                     action = 'a'
                 # else: regular merges (no action necessary)
+            self._results[dfile] = r, action
 
         return complete, r, action