Patchwork D9027: merge: check new filenode creation config before disabling optimization

login
register
mail settings
Submitter phabricator
Date Sept. 17, 2020, 9:50 a.m.
Message ID <differential-rev-PHID-DREV-jprjgeodyej3y6h6iy64-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47181/
State Superseded
Headers show

Comments

phabricator - Sept. 17, 2020, 9:50 a.m.
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Let's make sure that the config is also enabled before disabling the `m2-vs-ma`
  optimization.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: pulkit, #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
@@ -806,6 +806,7 @@ 
         pa not in ([wctx, p2] + wctx.parents())
         and not forcefulldiff
         and scmutil.istreemanifest(repo)
+        and repo.ui.configbool(b'experimental', b'merge-track-undeleted')
     ):
         # Identify which files are relevant to the merge, so we can limit the
         # total m1-vs-m2 diff to just those files. This has significant