diff mercurial/shelve.py @ 44270: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

--- a/mercurial/shelve.py	Wed Feb 05 16:16:15 2020 -0500
+++ b/mercurial/shelve.py	Wed Jan 15 15:30:25 2020 -0800
@@ -745,7 +745,7 @@
         try:
             checkparents(repo, state)
 
-            merge.update(repo, state.pendingctx, branchmerge=False, force=True)
+            merge.clean_update(state.pendingctx)
             if state.activebookmark and state.activebookmark in repo._bookmarks:
                 bookmarks.activate(repo, state.activebookmark)
             mergefiles(ui, repo, state.wctx, state.pendingctx)