Show More
@@ -365,8 +365,8 b' def overridecheckunknownfile(origfn, rep' | |||
|
365 | 365 | # Finally, the merge.applyupdates function will then take care of |
|
366 | 366 | # writing the files into the working copy and lfcommands.updatelfiles |
|
367 | 367 | # will update the largefiles. |
|
368 |
def override |
|
|
369 | partial, acceptremote=False): | |
|
368 | def overridecalculateupdates(origfn, repo, p1, p2, pa, branchmerge, force, | |
|
369 | partial, acceptremote=False): | |
|
370 | 370 | overwrite = force and not branchmerge |
|
371 | 371 | actions = origfn(repo, p1, p2, pa, branchmerge, force, partial, |
|
372 | 372 | acceptremote) |
@@ -96,8 +96,8 b' def uisetup(ui):' | |||
|
96 | 96 | overrides.overridecat) |
|
97 | 97 | entry = extensions.wrapfunction(merge, '_checkunknownfile', |
|
98 | 98 | overrides.overridecheckunknownfile) |
|
99 |
entry = extensions.wrapfunction(merge, ' |
|
|
100 |
overrides.override |
|
|
99 | entry = extensions.wrapfunction(merge, 'calculateupdates', | |
|
100 | overrides.overridecalculateupdates) | |
|
101 | 101 | entry = extensions.wrapfunction(filemerge, 'filemerge', |
|
102 | 102 | overrides.overridefilemerge) |
|
103 | 103 | entry = extensions.wrapfunction(cmdutil, 'copy', |
General Comments 0
You need to be logged in to leave comments.
Login now