Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.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 | 943248e47864 |
| children | 824b687ff6af |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Thu Oct 18 10:11:08 2018 -0700 +++ b/mercurial/cmdutil.py Thu Feb 09 09:17:40 2017 -0800 @@ -365,8 +365,8 @@ if backups: # Equivalent to hg.revert m = scmutil.matchfiles(repo, backups.keys()) - mergemod.update(repo, repo.dirstate.p1(), - False, True, matcher=m) + mergemod.update(repo, repo.dirstate.p1(), branchmerge=False, + force=True, matcher=m) # 3b. (apply) if dopatch: