Skip to content
Snippets Groups Projects
Commit bdc4861f authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

fsmonitor: fix silly "*kwargs" bug in merge.update() override

Everyone knows that it's supposed to be spelled with two asterisks.

It started failing in fad5e299cfc7 (update: accept --merge to allow
merging across topo branches (issue5125), 2017-02-13) because until
then there was only one argument that was covered by the kwargs, so
*kwargs or **kwargs both worked (or at least that's what I think with
my limited understanding of Python).
parent e8c04337
No related branches found
No related tags found
No related merge requests found
......@@ -669,7 +669,7 @@
with state_update(repo, node, distance, partial):
return orig(
repo, node, branchmerge, force, ancestor, mergeancestor,
labels, matcher, *kwargs)
labels, matcher, **kwargs)
def reposetup(ui, repo):
# We don't work with largefiles or inotify
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment