##// END OF EJS Templates
merge: introduce a merge() for that use-case...
Martin von Zweigbergk -
r44883:a45ffad9 default
parent child Browse files
Show More
@@ -1141,14 +1141,7 b' def merge('
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(
@@ -2590,6 +2590,23 b' def update('
2590 return stats
2590 return stats
2591
2591
2592
2592
2593 def merge(ctx, labels=None, force=False, wc=None):
2594 """Merge another topological branch into the working copy.
2595
2596 force = whether the merge was run with 'merge --force' (deprecated)
2597 """
2598
2599 return update(
2600 ctx.repo(),
2601 ctx.rev(),
2602 labels=labels,
2603 branchmerge=True,
2604 force=force,
2605 mergeforce=force,
2606 wc=wc,
2607 )
2608
2609
2593 def clean_update(ctx, wc=None):
2610 def clean_update(ctx, wc=None):
2594 """Do a clean update to the given commit.
2611 """Do a clean update to the given commit.
2595
2612
General Comments 0
You need to be logged in to leave comments. Login now