Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hg.py @ 45563:2c86b9587740
merge: make low-level update() private (API)
We have very few callers left that call the low-level `merge.update()`
function. I think it's time to make it private. I'll remove the
remaining callers in coming patches, except for one call from the
`rebase` module. I hope to eventually fix that too, but it's more
complex because it requires teaching `merge.graft()` to work with a
dirty working copy.
Differential Revision: https://phab.mercurial-scm.org/D9065
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 21 Sep 2020 11:12:58 -0700 |
parents | 03726f5b6092 |
children | 5c8230ca37f2 |
line wrap: on
line diff
--- a/mercurial/hg.py Mon Sep 21 10:09:39 2020 -0700 +++ b/mercurial/hg.py Mon Sep 21 11:12:58 2020 -0700 @@ -1049,7 +1049,7 @@ When overwrite is set, changes are clobbered, merged else returns stats (see pydoc mercurial.merge.applyupdates)""" - return mergemod.update( + return mergemod._update( repo, node, branchmerge=False,