# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1444897626 25200
# Node ID d773150d71f2d604ed3106a548aa4919ff2b746e
# Parent  64848559413aba223c9d50e0c9068f62b517636a
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.

diff -r 64848559413a -r d773150d71f2 mercurial/commands.py
--- 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