Mercurial > hg
changeset 32405:bdc4861ffe59
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).
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 22 May 2017 10:41:32 -0700 |
| parents | e8c043375b53 |
| children | 952017471f93 |
| files | hgext/fsmonitor/__init__.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/fsmonitor/__init__.py Fri May 19 20:06:45 2017 +0530 +++ b/hgext/fsmonitor/__init__.py Mon May 22 10:41:32 2017 -0700 @@ -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