Mercurial > hg-stable

changeset 27098:64cb281d23a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib/perf: fix perfmergecalculate merge.calculateupdates requires an array of ancestors and followcopies
author timeless <timeless@mozdev.org>
date Tue, 24 Nov 2015 21:44:16 +0000
parents b3e24a9c5f9b
children e94bfebb4f35
files contrib/perf.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/perf.py	Tue Nov 24 22:01:11 2015 +0000
+++ b/contrib/perf.py	Tue Nov 24 21:44:16 2015 +0000
@@ -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()