363 # presumably changed on purpose. |
363 # presumably changed on purpose. |
364 # |
364 # |
365 # Finally, the merge.applyupdates function will then take care of |
365 # Finally, the merge.applyupdates function will then take care of |
366 # writing the files into the working copy and lfcommands.updatelfiles |
366 # writing the files into the working copy and lfcommands.updatelfiles |
367 # will update the largefiles. |
367 # will update the largefiles. |
368 def overridecalculateupdates(origfn, repo, p1, p2, pa, branchmerge, force, |
368 def overridecalculateupdates(origfn, repo, p1, p2, pas, branchmerge, force, |
369 partial, acceptremote, followcopies): |
369 partial, acceptremote, followcopies): |
370 overwrite = force and not branchmerge |
370 overwrite = force and not branchmerge |
371 actions = origfn(repo, p1, p2, pa, branchmerge, force, partial, |
371 actions = origfn(repo, p1, p2, pas, branchmerge, force, partial, |
372 acceptremote, followcopies) |
372 acceptremote, followcopies) |
373 |
373 |
374 if overwrite: |
374 if overwrite: |
375 return actions |
375 return actions |
376 |
376 |