Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 40366:b14fdf1fb615

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 943248e47864
children 5cb72229f0e9
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Oct 18 10:11:08 2018 -0700
+++ b/mercurial/commands.py	Thu Feb 09 09:17:40 2017 -0800
@@ -643,7 +643,9 @@
         with dirstateguard.dirstateguard(repo, 'backout'):
             overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
             with ui.configoverride(overrides, 'backout'):
-                stats = mergemod.update(repo, parent, True, True, node, False)
+                stats = mergemod.update(repo, parent, branchmerge=True,
+                                        force=True, ancestor=node,
+                                        mergeancestor=False)
             repo.setparents(op1, op2)
         hg._showstats(repo, stats)
         if stats.unresolvedcount: