Patchwork [4,of,5,mergedriver] merge.recordupdates: mark 'a' files as added unconditionally

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 30, 2015, 6:34 p.m.
Message ID <1e00bbb100ed075df2e0.1448908494@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11672/
State Accepted
Delegated to: Martin von Zweigbergk
Headers show

Comments

Siddharth Agarwal - Nov. 30, 2015, 6:34 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1448407611 28800
#      Tue Nov 24 15:26:51 2015 -0800
# Node ID 1e00bbb100ed075df2e0330c7c3400935a9704af
# Parent  ed68353d325ad35058034561852d2535847717df
# Available At http://42.netv6.net/sid0-wip/hg/
#              hg pull http://42.netv6.net/sid0-wip/hg/ -r 1e00bbb100ed
merge.recordupdates: mark 'a' files as added unconditionally

See the previous patch for why we do this.

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1195,8 +1195,7 @@  def recordupdates(repo, actions, branchm
 
     # re-add
     for f, args, msg in actions.get('a', []):
-        if not branchmerge:
-            repo.dirstate.add(f)
+        repo.dirstate.add(f)
 
     # re-add/mark as modified
     for f, args, msg in actions.get('am', []):