Mercurial > hg

changeset 26788:d773150d71f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 15 Oct 2015 01:27:06 -0700
parents 64848559413a
children e6003ecf3257
files mercurial/commands.py
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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