Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 44317:f546d2170b0f
merge: introduce a clean_update() for that use-case
I find it hard to understand what value to pass for all the arguments
to `merge.update()`. I would like to introduce functions that are more
specific to each use-case. We already have `graft()`. This patch
introduces a `clean_update()` and uses it in some places to show that
it works.
Differential Revision: https://phab.mercurial-scm.org/D7902
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 15 Jan 2020 15:30:25 -0800 |
| parents | b1069b369d6e |
| children | c791ed6a2154 |
line wrap: on
line diff
--- a/mercurial/merge.py Wed Feb 05 16:16:15 2020 -0500 +++ b/mercurial/merge.py Wed Jan 15 15:30:25 2020 -0800 @@ -2597,6 +2597,15 @@ return stats +def clean_update(ctx, wc=None): + """Do a clean update to the given commit. + + This involves updating to the commit and discarding any changes in the + working copy. + """ + return update(ctx.repo(), ctx.rev(), branchmerge=False, force=True, wc=wc) + + def graft( repo, ctx,