403 # in a file 'foo' if we already have a largefile with the same name. |
403 # in a file 'foo' if we already have a largefile with the same name. |
404 # |
404 # |
405 # The overridden function filters the unknown files by removing any |
405 # The overridden function filters the unknown files by removing any |
406 # largefiles. This makes the merge proceed and we can then handle this |
406 # largefiles. This makes the merge proceed and we can then handle this |
407 # case further in the overridden calculateupdates function below. |
407 # case further in the overridden calculateupdates function below. |
408 def overridecheckunknownfile(origfn, repo, wctx, mctx, f): |
408 def overridecheckunknownfile(origfn, repo, wctx, mctx, f, f2=None): |
409 if lfutil.standin(repo.dirstate.normalize(f)) in wctx: |
409 if lfutil.standin(repo.dirstate.normalize(f)) in wctx: |
410 return False |
410 return False |
411 return origfn(repo, wctx, mctx, f) |
411 return origfn(repo, wctx, mctx, f, f2) |
412 |
412 |
413 # The manifest merge handles conflicts on the manifest level. We want |
413 # The manifest merge handles conflicts on the manifest level. We want |
414 # to handle changes in largefile-ness of files at this level too. |
414 # to handle changes in largefile-ness of files at this level too. |
415 # |
415 # |
416 # The strategy is to run the original calculateupdates and then process |
416 # The strategy is to run the original calculateupdates and then process |