Show More
@@ -239,8 +239,8 b' def perfmergecalculate(ui, repo, rev, **' | |||||
239 | def d(): |
|
239 | def d(): | |
240 | # acceptremote is True because we don't want prompts in the middle of |
|
240 | # acceptremote is True because we don't want prompts in the middle of | |
241 | # our benchmark |
|
241 | # our benchmark | |
242 |
merge.calculateupdates(repo, wctx, rctx, ancestor |
|
242 | merge.calculateupdates(repo, wctx, rctx, [ancestor], False, False, | |
243 | acceptremote=True) |
|
243 | False, acceptremote=True, followcopies=True) | |
244 | timer(d) |
|
244 | timer(d) | |
245 | fm.end() |
|
245 | fm.end() | |
246 |
|
246 |
General Comments 0
You need to be logged in to leave comments.
Login now