##// END OF EJS Templates
sparse: add comment for an if condition which I tried to refactor...
Pulkit Goyal -
r45852:6a8eafae default
parent child Browse files
Show More
@@ -407,6 +407,12 b' def filterupdatesactions(repo, wctx, mct'
407 elif file in wctx:
407 elif file in wctx:
408 prunedactions[file] = (mergestatemod.ACTION_REMOVE, args, msg)
408 prunedactions[file] = (mergestatemod.ACTION_REMOVE, args, msg)
409
409
410 # in case or rename on one side, it is possible that f1 might not
411 # be present in sparse checkout we should include it
412 # TODO: should we do the same for f2?
413 # exists as a separate check because file can be in sparse and hence
414 # if we try to club this condition in above `elif type == ACTION_MERGE`
415 # it won't be triggered
410 if branchmerge and type == mergestatemod.ACTION_MERGE:
416 if branchmerge and type == mergestatemod.ACTION_MERGE:
411 f1, f2, fa, move, anc = args
417 f1, f2, fa, move, anc = args
412 if not sparsematch(f1):
418 if not sparsematch(f1):
General Comments 0
You need to be logged in to leave comments. Login now