Patchwork D9119: salvaged: track removal-candidates in more cases

login
register
mail settings
Submitter phabricator
Date Sept. 29, 2020, 10:37 a.m.
Message ID <differential-rev-PHID-DREV-kokofvdbdsbuocj4fisn-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47335/
State Superseded
Headers show

Comments

phabricator - Sept. 29, 2020, 10:37 a.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  If we want to use this information for copy tracing, then we need to be able to
  record it.
  
  First we unlock the recording of deletion candidate, and we will actually record
  the data in the next changeset.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: marmoute, #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
@@ -781,7 +781,10 @@ 
     if (
         pa not in ([wctx, p2] + wctx.parents())
         and not forcefulldiff
-        and not repo.ui.configbool(b'experimental', b'merge-track-salvaged')
+        and not (
+            repo.ui.configbool(b'experimental', b'merge-track-salvaged')
+            or repo.filecopiesmode == b'changeset-sidedata'
+        )
     ):
         # 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