Mercurial > public > mercurial-scm > hg-stable

diff mercurial/hg.py @ 44430:a45ffad9ae98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: introduce a merge() for that use-case In the same vein as some earlier patches like f546d2170b0f (merge: introduce a clean_update() for that use-case, 2020-01-15). Differential Revision: https://phab.mercurial-scm.org/D8168
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 26 Feb 2020 10:40:31 -0800
parents ddbc296a1f48
children 2f290136b7d6
line wrap: on
line diff
--- a/mercurial/hg.py	Wed Feb 26 11:00:50 2020 -0800
+++ b/mercurial/hg.py	Wed Feb 26 10:40:31 2020 -0800
@@ -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(