Patchwork D8572: merge: remove special case for in-memory merge

login
register
mail settings
Submitter phabricator
Date May 19, 2020, 7:53 p.m.
Message ID <differential-rev-PHID-DREV-57grqzeq2jht5hyqj3dj-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46362/
State Superseded
Headers show

Comments

phabricator - May 19, 2020, 7:53 p.m.
durin42 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This is now handled by the mergestate object, which knows if mergedriver works.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1367,10 +1367,6 @@ 
     usemergedriver = not overwrite and mergeactions and ms.mergedriver
 
     if usemergedriver:
-        if wctx.isinmemory():
-            raise error.InMemoryMergeConflictsError(
-                b"in-memory merge does not support mergedriver"
-            )
         ms.commit()
         proceed = driverpreprocess(repo, ms, wctx, labels=labels)
         # the driver might leave some files unresolved