Mercurial > hg-stable

changeset 27089:dbb30bc16fc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: record dirstate actions after performing resolutions Some resolutions might lead to pending actions we need to perform in the dirstate -- so perform them.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 15 Nov 2015 21:27:22 -0800
parents e2b79f57903a
children ef6f98473a48
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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"))