--- a/hgext/largefiles/overrides.py Sat Feb 09 15:43:02 2013 +0000
+++ b/hgext/largefiles/overrides.py Fri Feb 08 15:23:23 2013 +0000
@@ -360,8 +360,10 @@
# 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, overwrite, partial):
- actions = origfn(repo, p1, p2, pa, overwrite, partial)
+def overridemanifestmerge(origfn, repo, p1, p2, pa, branchmerge, force,
+ partial):
+ overwrite = force and not branchmerge
+ actions = origfn(repo, p1, p2, pa, branchmerge, force, partial)
processed = []
for action in actions: