##// END OF EJS Templates
sparse: use `update_file` instead of `normal` during `applyupdates`...
marmoute -
r48509:a0e79084 default
parent child Browse files
Show More
@@ -453,7 +453,7 b' def filterupdatesactions(repo, wctx, mct'
453 for file, flags, msg in tmresult.getactions(
453 for file, flags, msg in tmresult.getactions(
454 [mergestatemod.ACTION_GET]
454 [mergestatemod.ACTION_GET]
455 ):
455 ):
456 dirstate.normal(file)
456 dirstate.update_file(file, p1_tracked=True, wc_tracked=True)
457
457
458 profiles = activeconfig(repo)[2]
458 profiles = activeconfig(repo)[2]
459 changedprofiles = profiles & files
459 changedprofiles = profiles & files
General Comments 0
You need to be logged in to leave comments. Login now