Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 21 Nov 2020 09:30:34 +0100] rev 46126
copies-rust: extract conflicting value comparison in its own function
First, that logic is complicated enough to be in it own function. Second, we
want to start adding alternative path within the merge code so we need this logic
easily accessible in multiple places.
Differential Revision: https://phab.mercurial-scm.org/D9424
Matt Harbison <matt_harbison@yahoo.com> [Thu, 17 Dec 2020 00:48:36 -0500] rev 46125
mergetools: alphabetize the config settings
This will make it easier to identify differences with the TortoiseHg config
file. It was simply piped through `sort`, and then the spacing and comments
restored into the proper place. The `UltraCompare` config was positioned such
that the sort is case insensitive- it's the only camelcase config in here.
Differential Revision: https://phab.mercurial-scm.org/D9620
Joerg Sonnenberger <joerg@bec.de> [Mon, 14 Dec 2020 19:48:35 +0100] rev 46124
share: properly copy cache files when cloning from a share
If a is shared to b and b cloned to c, the old code would look directly
under b/.hg for the cache directory and not use the cachevfs layer to
pick the members from a/.hg/cache. Adjust variable names and comments to
reflect that the function is used for more than just the branchmap
cache.
Differential Revision: https://phab.mercurial-scm.org/D9598
Joerg Sonnenberger <joerg@bec.de> [Mon, 14 Dec 2020 18:19:58 +0100] rev 46123
tests: workaround for a flaky test
Differential Revision: https://phab.mercurial-scm.org/D9597