commands.resolve: call driverpreprocess if we haven't run it yet
We need to be careful about allowing --mark and --unmark to keep working -- we
don't want the user to be stuck in a weird state. The exact behavior here is
still to be decided, though.
--- a/mercurial/commands.py Thu Oct 15 01:22:01 2015 -0700
+++ b/mercurial/commands.py Thu Oct 15 01:27:06 2015 -0700
@@ -5606,6 +5606,13 @@
wctx = repo[None]
+ if ms.mergedriver and ms.mdstate() == 'u':
+ proceed = mergemod.driverpreprocess(repo, ms, wctx)
+ ms.commit()
+ # allow mark and unmark to go through
+ if not mark and not unmark and not proceed:
+ return 1
+
m = scmutil.match(wctx, pats, opts)
ret = 0
didwork = False