Mercurial > public > mercurial-scm > hg-stable
diff hgext/histedit.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 | c303d65d2e34 |
| children | c36175456350 |
line wrap: on
line diff
--- a/hgext/histedit.py Thu Oct 18 10:11:08 2018 -0700 +++ b/hgext/histedit.py Thu Feb 09 09:17:40 2017 -0800 @@ -830,8 +830,7 @@ def run(self): if self.repo['.'].node() != self.node: - mergemod.update(self.repo, self.node, False, True) - # branchmerge, force) + mergemod.update(self.repo, self.node, branchmerge=False, force=True) return self.continueclean() def continuedirty(self):