Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 45661:ebc14a2ad23d
salvaged: track removal-candidates in more cases
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 candidates, and we will actually record
the data in the next changeset.
Differential Revision: https://phab.mercurial-scm.org/D9119
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 14 Sep 2020 23:46:38 +0200 |
| parents | 588068d5f2da |
| children | ed0ded64a8a9 |
comparison
equal
deleted
inserted
replaced
| 45660:e66db30f95a8 | 45661:ebc14a2ad23d |
|---|---|
| 779 # - we are tracking salvaged files specifically hence should process all | 779 # - we are tracking salvaged files specifically hence should process all |
| 780 # files | 780 # files |
| 781 if ( | 781 if ( |
| 782 pa not in ([wctx, p2] + wctx.parents()) | 782 pa not in ([wctx, p2] + wctx.parents()) |
| 783 and not forcefulldiff | 783 and not forcefulldiff |
| 784 and not repo.ui.configbool(b'experimental', b'merge-track-salvaged') | 784 and not ( |
| 785 repo.ui.configbool(b'experimental', b'merge-track-salvaged') | |
| 786 or repo.filecopiesmode == b'changeset-sidedata' | |
| 787 ) | |
| 785 ): | 788 ): |
| 786 # Identify which files are relevant to the merge, so we can limit the | 789 # Identify which files are relevant to the merge, so we can limit the |
| 787 # total m1-vs-m2 diff to just those files. This has significant | 790 # total m1-vs-m2 diff to just those files. This has significant |
| 788 # performance benefits in large repositories. | 791 # performance benefits in large repositories. |
| 789 relevantfiles = set(ma.diff(m2).keys()) | 792 relevantfiles = set(ma.diff(m2).keys()) |