facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

merge.recordupdates: mark 'a' files as added unconditionally

Browse Source 
See the previous patch for why we do this.
This commit is contained in:
Siddharth Agarwal 2015-11-24 15:26:51 -08:00
parent 3a27c524dc
commit ed64d46a37
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mercurial/merge.py
View File

@ -1195,7 +1195,6 @@ def recordupdates(repo, actions, branchmerge):
# re-add
for f, args, msg in actions.get('a', []):
if not branchmerge:
repo.dirstate.add(f)
# re-add/mark as modified