Patchwork [3,of,5,mergedriver] resolve: record dirstate actions after performing resolutions

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 23, 2015, 6 a.m.
Message ID <bc37d2bf7a29597601a0.1448258449@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11596/
State Accepted
Headers show

Comments

Siddharth Agarwal - Nov. 23, 2015, 6 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447651642 28800
#      Sun Nov 15 21:27:22 2015 -0800
# Node ID bc37d2bf7a29597601a08bbb37139a1b80550c39
# Parent  cbe7da5c76664eda2c9ab0369a0fa2f6ceff981c
# Available At http://42.netv6.net/sid0-wip/hg/
#              hg pull http://42.netv6.net/sid0-wip/hg/ -r bc37d2bf7a29
resolve: record dirstate actions after performing resolutions

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

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5711,6 +5711,7 @@  def resolve(ui, repo, *pats, **opts):
                     raise
 
         ms.commit()
+        ms.recordactions()
 
         if not didwork and pats:
             ui.warn(_("arguments do not match paths that need resolving\n"))