Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: record dirstate actions after performing resolutions
authorSiddharth Agarwal <sid0@fb.com>
Sun, 15 Nov 2015 21:27:22 -0800
changeset 27089 dbb30bc16fc2
parent 27088 e2b79f57903a
child 27090 ef6f98473a48
resolve: record dirstate actions after performing resolutions Some resolutions might lead to pending actions we need to perform in the dirstate -- so perform them.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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"))
Mercurial