--- a/hgext/largefiles/overrides.py Tue Dec 09 14:18:31 2014 -0800
+++ b/hgext/largefiles/overrides.py Tue Dec 09 16:49:55 2014 -0800
@@ -418,11 +418,12 @@
def overridecalculateupdates(origfn, repo, p1, p2, pas, branchmerge, force,
partial, acceptremote, followcopies):
overwrite = force and not branchmerge
- actions = origfn(repo, p1, p2, pas, branchmerge, force, partial,
- acceptremote, followcopies)
+ actions, diverge, renamedelete = origfn(
+ repo, p1, p2, pas, branchmerge, force, partial, acceptremote,
+ followcopies)
if overwrite:
- return actions
+ return actions, diverge, renamedelete
removes = set(a[0] for a in actions['r'])
@@ -481,7 +482,7 @@
lfmr.sort()
actions['lfmr'] = lfmr
- return actions
+ return actions, diverge, renamedelete
def mergerecordupdates(orig, repo, actions, branchmerge):
if 'lfmr' in actions: