# HG changeset patch
# User Phil Cohen <phillco@fb.com>
# Date 1514404401 21600
# Node ID 87918218da70cac7ec380335aa6ff1334c10b518
# Parent  b55a142f00c5a92a19ff94fbe9b5d09e28716860
merge: raise before running mergedriver if using IMM

Merge driver scripts run in the working copy, so disable with IMM for now.

Differential Revision: https://phab.mercurial-scm.org/D1781

diff -r b55a142f00c5 -r 87918218da70 mercurial/merge.py
--- a/mercurial/merge.py	Tue Dec 26 22:56:07 2017 +0530
+++ b/mercurial/merge.py	Wed Dec 27 13:53:21 2017 -0600
@@ -1556,6 +1556,9 @@
     usemergedriver = not overwrite and mergeactions and ms.mergedriver
 
     if usemergedriver:
+        if wctx.isinmemory():
+            raise error.InMemoryMergeConflictsError("in-memory merge does not "
+                                                    "support mergedriver")
         ms.commit()
         proceed = driverpreprocess(repo, ms, wctx, labels=labels)
         # the driver might leave some files unresolved