##// END OF EJS Templates
merge.recordupdates: mark 'a' files as added unconditionally...
Siddharth Agarwal -
r27132:baa7571f default
parent child Browse files
Show More
@@ -1195,8 +1195,7 b' def recordupdates(repo, actions, branchm'
1195
1195
1196 # re-add
1196 # re-add
1197 for f, args, msg in actions.get('a', []):
1197 for f, args, msg in actions.get('a', []):
1198 if not branchmerge:
1198 repo.dirstate.add(f)
1199 repo.dirstate.add(f)
1200
1199
1201 # re-add/mark as modified
1200 # re-add/mark as modified
1202 for f, args, msg in actions.get('am', []):
1201 for f, args, msg in actions.get('am', []):
General Comments 0
You need to be logged in to leave comments. Login now