[PATCH 4 of 7] contrib/perf: fix perfmergecalculate
timeless
timeless at mozdev.org
Tue Nov 24 16:36:27 CST 2015
# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1448401456 0
# Tue Nov 24 21:44:16 2015 +0000
# Node ID 8fe942905e529e04e6d0e19e5b62ee6458eb1266
# Parent eefb1310ac0c34e935ca867c8aa7142ffe7cefc3
contrib/perf: fix perfmergecalculate
merge.calculateupdates requires an array of ancestors and followcopies
diff --git a/contrib/perf.py b/contrib/perf.py
--- a/contrib/perf.py
+++ b/contrib/perf.py
@@ -239,8 +239,8 @@
def d():
# acceptremote is True because we don't want prompts in the middle of
# our benchmark
- merge.calculateupdates(repo, wctx, rctx, ancestor, False, False, False,
- acceptremote=True)
+ merge.calculateupdates(repo, wctx, rctx, [ancestor], False, False,
+ False, acceptremote=True, followcopies=True)
timer(d)
fm.end()
More information about the Mercurial-devel
mailing list