Mercurial > public > mercurial-scm > hg
diff hgext/shelve.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 | 29e4a77b5305 |
line wrap: on
line diff
--- a/hgext/shelve.py Thu Oct 18 10:11:08 2018 -0700 +++ b/hgext/shelve.py Thu Feb 09 09:17:40 2017 -0800 @@ -656,7 +656,7 @@ try: checkparents(repo, state) - merge.update(repo, state.pendingctx, False, True) + merge.update(repo, state.pendingctx, branchmerge=False, force=True) if (state.activebookmark and state.activebookmark in repo._bookmarks): bookmarks.activate(repo, state.activebookmark)