--- a/mercurial/merge.py Mon Sep 21 10:09:39 2020 -0700
+++ b/mercurial/merge.py Mon Sep 21 11:12:58 2020 -0700
@@ -1694,7 +1694,7 @@
UPDATECHECK_NO_CONFLICT = b'noconflict'
-def update(
+def _update(
repo,
node,
branchmerge,
@@ -2045,7 +2045,7 @@
force = whether the merge was run with 'merge --force' (deprecated)
"""
- return update(
+ return _update(
ctx.repo(),
ctx.rev(),
labels=labels,
@@ -2062,7 +2062,7 @@
This involves updating to the commit and discarding any changes in the
working copy.
"""
- return update(ctx.repo(), ctx.rev(), branchmerge=False, force=True, wc=wc)
+ return _update(ctx.repo(), ctx.rev(), branchmerge=False, force=True, wc=wc)
def revert_to(ctx, matcher=None, wc=None):
@@ -2072,7 +2072,7 @@
be the same as in the given commit.
"""
- return update(
+ return _update(
ctx.repo(),
ctx.rev(),
branchmerge=False,
@@ -2123,7 +2123,7 @@
or pctx.rev() == base.rev()
)
- stats = update(
+ stats = _update(
repo,
ctx.node(),
True,
@@ -2166,7 +2166,7 @@
b"must specify parent of merge commit to back out"
)
parent = ctx.p1()
- return update(
+ return _update(
ctx.repo(),
parent,
branchmerge=True,