Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hg.py @ 40366:b14fdf1fb615
update: clarify update() call sites by specifying argument names
merge.update() takes a lot of parameters and I get confused all the
time which is which.
Differential Revision: https://phab.mercurial-scm.org/D5153
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 09 Feb 2017 09:17:40 -0800 |
| parents | ac59de55c8b4 |
| children | 7e3b6c4f01a2 |
line wrap: on
line diff
--- a/mercurial/hg.py Thu Oct 18 10:11:08 2018 -0700 +++ b/mercurial/hg.py Thu Feb 09 09:17:40 2017 -0800 @@ -846,7 +846,7 @@ When overwrite is set, changes are clobbered, merged else returns stats (see pydoc mercurial.merge.applyupdates)""" - return mergemod.update(repo, node, False, overwrite, + return mergemod.update(repo, node, branchmerge=False, force=overwrite, labels=['working copy', 'destination'], updatecheck=updatecheck) @@ -949,8 +949,8 @@ """Branch merge with node, resolving changes. Return true if any unresolved conflicts.""" if not abort: - stats = mergemod.update(repo, node, True, force, mergeforce=mergeforce, - labels=labels) + stats = mergemod.update(repo, node, branchmerge=True, force=force, + mergeforce=mergeforce, labels=labels) else: ms = mergemod.mergestate.read(repo) if ms.active():