Patchwork D1781: merge: raise before running mergedriver if using IMM

login
register
mail settings
Submitter phabricator
Date Dec. 27, 2017, 11:37 p.m.
Message ID <28649f7340d82f967f8b6f5e079cdc24@localhost.localdomain>
Download mbox | patch
Permalink /patch/26477/
State Not Applicable
Headers show

Comments

phabricator - Dec. 27, 2017, 11:37 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG87918218da70: merge: raise before running mergedriver if using IMM (authored by phillco, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1781?vs=4643&id=4646

REVISION DETAIL
  https://phab.mercurial-scm.org/D1781

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: phillco, #hg-reviewers, quark, indygreg
Cc: mercurial-devel

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -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