# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447651642 28800
# Node ID dbb30bc16fc243ff94393aa25b0a1b0c35aef017
# Parent  e2b79f57903a57d754978ead5639fac5b5694e15
resolve: record dirstate actions after performing resolutions

Some resolutions might lead to pending actions we need to perform in the
dirstate -- so perform them.

diff -r e2b79f57903a -r dbb30bc16fc2 mercurial/commands.py
--- a/mercurial/commands.py	Fri Nov 20 16:55:01 2015 -0800
+++ b/mercurial/commands.py	Sun Nov 15 21:27:22 2015 -0800
@@ -5711,6 +5711,7 @@
                     raise
 
         ms.commit()
+        ms.recordactions()
 
         if not didwork and pats:
             ui.warn(_("arguments do not match paths that need resolving\n"))