Mercurial > public > mercurial-scm > hg
comparison mercurial/hg.py @ 44399:a45ffad9ae98
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 |
comparison
equal
deleted
inserted
replaced
| 44398:ddbc296a1f48 | 44399:a45ffad9ae98 |
|---|---|
| 1139 def merge( | 1139 def merge( |
| 1140 repo, node, force=False, remind=True, labels=None, | 1140 repo, node, force=False, remind=True, labels=None, |
| 1141 ): | 1141 ): |
| 1142 """Branch merge with node, resolving changes. Return true if any | 1142 """Branch merge with node, resolving changes. Return true if any |
| 1143 unresolved conflicts.""" | 1143 unresolved conflicts.""" |
| 1144 stats = mergemod.update( | 1144 stats = mergemod.merge(repo[node], force=force, labels=labels) |
| 1145 repo, | |
| 1146 node, | |
| 1147 branchmerge=True, | |
| 1148 force=force, | |
| 1149 mergeforce=force, | |
| 1150 labels=labels, | |
| 1151 ) | |
| 1152 _showstats(repo, stats) | 1145 _showstats(repo, stats) |
| 1153 if stats.unresolvedcount: | 1146 if stats.unresolvedcount: |
| 1154 repo.ui.status( | 1147 repo.ui.status( |
| 1155 _( | 1148 _( |
| 1156 b"use 'hg resolve' to retry unresolved file merges " | 1149 b"use 'hg resolve' to retry unresolved file merges " |