resolve: perform all premerges before performing any file merges (BC)

Just like the BC to merge before it, this allows for a maximally consistent
state before providing any prompts to the user.

mercurial/commands.py

@@ -5568,6 +5568,7 b' def resolve(ui, repo, *pats, **opts):'
         ret = 0
         didwork = False
 
+        tocomplete = []
         for f in ms:
             if not m(f):
                 continue
@@ -5586,11 +5587,28 b' def resolve(ui, repo, *pats, **opts):'
                 util.copyfile(a, a + ".resolve")
 
                 try:
-                    # resolve file
+                    # preresolve file
                     ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
                                  'resolve')
                     complete, r = ms.preresolve(f, wctx)
                     if not complete:
+                        tocomplete.append(f)
+                    elif r:
+                        ret = 1
+                finally:
+                    ui.setconfig('ui', 'forcemerge', '', 'resolve')
+                    ms.commit()
+
+                # replace filemerge's .orig file with our resolve file
+                # for files in tocomplete, ms.resolve will not overwrite
+                # .orig -- only preresolve does
+                util.rename(a + ".resolve", a + ".orig")
+
+        for f in tocomplete:
+            try:
+                # resolve file
+                ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
+                             'resolve')
                         r = ms.resolve(f, wctx)
                     if r:
                         ret = 1
@@ -5598,9 +5616,6 b' def resolve(ui, repo, *pats, **opts):'
                     ui.setconfig('ui', 'forcemerge', '', 'resolve')
                     ms.commit()
 
-                # replace filemerge's .orig file with our resolve file
-                util.rename(a + ".resolve", a + ".orig")
-
         ms.commit()
 
         if not didwork and pats:

tests/test-resolve.t

@@ -135,8 +135,8 b' resolve without arguments should suggest'
 resolve --all should re-merge all unresolved files
   $ hg resolve --all
   merging file1
+  merging file2
   warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
-  merging file2
   warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
   [1]
   $ cat file1.orig