##// END OF EJS Templates
mergestate: use `update_file` to handle for `ACTION_EXEC`...
marmoute -
r48527:0e581d7e default
parent child Browse files
Show More
@@ -776,7 +776,9 b' def recordupdates(repo, actions, branchm'
776
776
777 # exec change
777 # exec change
778 for f, args, msg in actions.get(ACTION_EXEC, []):
778 for f, args, msg in actions.get(ACTION_EXEC, []):
779 repo.dirstate.normallookup(f)
779 repo.dirstate.update_file(
780 f, p1_tracked=True, wc_tracked=True, possibly_dirty=True
781 )
780
782
781 # keep
783 # keep
782 for f, args, msg in actions.get(ACTION_KEEP, []):
784 for f, args, msg in actions.get(ACTION_KEEP, []):
General Comments 0
You need to be logged in to leave comments. Login now