Read about our upcoming Code of Conduct on this issue

Commit 12122d22 authored by timeless's avatar timeless
Browse files

contrib/perf: fix perfmergecalculate

merge.calculateupdates requires an array of ancestors and followcopies
parent b3e24a9c5f9b
......@@ -239,8 +239,8 @@ def perfmergecalculate(ui, repo, rev, **opts):
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,
merge.calculateupdates(repo, wctx, rctx, [ancestor], False, False,
False, acceptremote=True, followcopies=True)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment