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.
merge.recordupdates: mark 'a' files as added unconditionally
authorSiddharth Agarwal <sid0@fb.com>
Tue, 24 Nov 2015 15:26:51 -0800
changeset 27132 baa7571f40c5
parent 27131 d837da26155e
child 27133 8dff49c34a67
merge.recordupdates: mark 'a' files as added unconditionally See the previous patch for why we do this.
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- 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', []):
Mercurial