Mercurial > hg-stable

changeset 27132:baa7571f40c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.recordupdates: mark 'a' files as added unconditionally See the previous patch for why we do this.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 24 Nov 2015 15:26:51 -0800
parents d837da26155e
children 8dff49c34a67
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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', []):