Pulkit Goyal <7895pulkit@gmail.com> [Tue, 02 Feb 2021 23:44:31 +0530] rev 46457
Added tag 5.7 for changeset 0e2e7300f430
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 02 Feb 2021 15:35:58 +0100] rev 46456
ci-fix: backed out changeset 45afff0f530a
This changeset is part of a series that break Continuous integration on python 2
for about a week. As not concrete solution have been found so far the safer
seems to back it out until we can figure the details out.
Differential Revision: https://phab.mercurial-scm.org/D9948
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 02 Feb 2021 15:35:38 +0100] rev 46455
ci-fix: backed out changeset d4c8b4b90ecb
This changeset is part of a series that break Continuous integration on python 2
for about a week. As not concrete solution have been found so far the safer
seems to back it out until we can figure the details out.
Differential Revision: https://phab.mercurial-scm.org/D9947
Augie Fackler <augie@google.com> [Mon, 01 Feb 2021 17:13:24 -0500] rev 46454
relnotes: add entry for `hg diff --merge -c`
Differential Revision: https://phab.mercurial-scm.org/D9944
Martin von Zweigbergk <martinvonz@google.com> [Mon, 01 Feb 2021 12:55:53 -0800] rev 46453
branching: merge with stable
Martin von Zweigbergk <martinvonz@google.com> [Fri, 29 Jan 2021 10:32:19 -0800] rev 46452
relnotes: copy "next" to "5.7" and clear "next"
The same procedure as every year^Wcycle.
Differential Revision: https://phab.mercurial-scm.org/D9909
Matt Harbison <matt_harbison@yahoo.com> [Mon, 01 Feb 2021 15:37:03 -0500] rev 46451
relnotes: elaborate on the side effects of hooks having HGPLAIN=1
Differential Revision: https://phab.mercurial-scm.org/D9943
Matt Harbison <matt_harbison@yahoo.com> [Sun, 31 Jan 2021 19:56:52 -0500] rev 46450
packaging: replace a documentation reference to `python3` on Windows
Sadly, there's not `python3.exe` on Windows.
Differential Revision: https://phab.mercurial-scm.org/D9937
Augie Fackler <augie@google.com> [Mon, 01 Feb 2021 11:57:18 -0500] rev 46449
diff: suppress `merging foo` output lines when performing a merge diff
Differential Revision: https://phab.mercurial-scm.org/D9939
Augie Fackler <augie@google.com> [Thu, 07 May 2020 16:50:26 -0400] rev 46448
diff: add experimental support for "merge diffs"
The way this works is it re-runs the merge and "stores" conflicts, and then
diffs against the conflicted result. In a normal merge, you should only see
diffs against conflicted regions or in cases where there was a semantic
conflict but not a textual one. This makes it easier to detect "evil merges"
that contain substantial new work embedded in the merge commit.
Differential Revision: https://phab.mercurial-scm.org/D8504