# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1448407611 28800
# Node ID baa7571f40c5f134d9639e4193fbaedb58e6c3f4
# Parent  d837da26155e759257902a8cd1c187d510956fb3
merge.recordupdates: mark 'a' files as added unconditionally

See the previous patch for why we do this.

diff -r d837da26155e -r baa7571f40c5 mercurial/merge.py
--- a/mercurial/merge.py	Mon Nov 30 10:19:39 2015 -0800
+++ b/mercurial/merge.py	Tue Nov 24 15:26:51 2015 -0800
@@ -1195,8 +1195,7 @@
 
     # 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', []):