Mercurial > public > mercurial-scm > hg
diff mercurial/merge.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 | 5e3402a0b868 |
| children | 9d2b2df2c2ba |
line wrap: on
line diff
--- a/mercurial/merge.py Wed Feb 26 11:00:50 2020 -0800 +++ b/mercurial/merge.py Wed Feb 26 10:40:31 2020 -0800 @@ -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.