D1781: merge: raise before running mergedriver if using IMM
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Wed Dec 27 19:51:44 UTC 2017
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1781
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
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
To: phillco, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list