Comments
Patch
@@ -365,8 +365,8 @@ def overridecheckunknownfile(origfn, rep
# Finally, the merge.applyupdates function will then take care of
# writing the files into the working copy and lfcommands.updatelfiles
# will update the largefiles.
-def overridemanifestmerge(origfn, repo, p1, p2, pa, branchmerge, force,
- partial, acceptremote=False):
+def overridecalculateupdates(origfn, repo, p1, p2, pa, branchmerge, force,
+ partial, acceptremote=False):
overwrite = force and not branchmerge
actions = origfn(repo, p1, p2, pa, branchmerge, force, partial,
acceptremote)
@@ -96,8 +96,8 @@ def uisetup(ui):
overrides.overridecat)
entry = extensions.wrapfunction(merge, '_checkunknownfile',
overrides.overridecheckunknownfile)
- entry = extensions.wrapfunction(merge, 'manifestmerge',
- overrides.overridemanifestmerge)
+ entry = extensions.wrapfunction(merge, 'calculateupdates',
+ overrides.overridecalculateupdates)
entry = extensions.wrapfunction(filemerge, 'filemerge',
overrides.overridefilemerge)
entry = extensions.wrapfunction(cmdutil, 'copy',