diff -r 5887973febc7 -r 64051af15596 mercurial/upgrade.py --- a/mercurial/upgrade.py Fri Jul 13 02:54:52 2018 +0200 +++ b/mercurial/upgrade.py Fri Jul 13 11:45:15 2018 +0200 @@ -456,7 +456,7 @@ #reverse of "/".join(("data", path + ".i")) return filelog.filelog(repo.svfs, path[5:-2]) -def _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, deltabothparents): +def _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, forcedeltabothparents): """Copy revlogs between 2 repos.""" revcount = 0 srcsize = 0 @@ -578,7 +578,7 @@ ui.note(_('cloning %d revisions from %s\n') % (len(oldrl), unencoded)) oldrl.clone(tr, newrl, addrevisioncb=oncopiedrevision, deltareuse=deltareuse, - deltabothparents=deltabothparents) + forcedeltabothparents=forcedeltabothparents) info = newrl.storageinfo(storedsize=True) datasize = info['storedsize'] or 0