Comments
Patch
@@ -2590,6 +2590,23 @@
return stats
+def merge(ctx, labels=None, force=False, wc=None):
+ """Merge another topological branch into the working copy.
+
+ force = whether the merge was run with 'merge --force' (deprecated)
+ """
+
+ return update(
+ ctx.repo(),
+ ctx.rev(),
+ labels=labels,
+ branchmerge=True,
+ force=force,
+ mergeforce=force,
+ wc=wc,
+ )
+
+
def clean_update(ctx, wc=None):
"""Do a clean update to the given commit.
@@ -1141,14 +1141,7 @@
):
"""Branch merge with node, resolving changes. Return true if any
unresolved conflicts."""
- stats = mergemod.update(
- repo,
- node,
- branchmerge=True,
- force=force,
- mergeforce=force,
- labels=labels,
- )
+ stats = mergemod.merge(repo[node], force=force, labels=labels)
_showstats(repo, stats)
if stats.unresolvedcount:
repo.ui.status(