Thu, 28 Apr 2022 11:01:41 -0400 wix: drop python2 conditionals
Matt Harbison <matt_harbison@yahoo.com> [Thu, 28 Apr 2022 11:01:41 -0400] rev 49169
wix: drop python2 conditionals Differential Revision: https://phab.mercurial-scm.org/D12595
Wed, 27 Apr 2022 19:45:19 +0400 tests: fix misspelling of supersede
Anton Shestakov <av6@dwimlabs.net> [Wed, 27 Apr 2022 19:45:19 +0400] rev 49168
tests: fix misspelling of supersede Differential Revision: https://phab.mercurial-scm.org/D12589
Tue, 26 Apr 2022 09:06:30 -0700 filemerge: add configs to disable some or all partial merge tools
Martin von Zweigbergk <martinvonz@google.com> [Tue, 26 Apr 2022 09:06:30 -0700] rev 49167
filemerge: add configs to disable some or all partial merge tools When rolling out partial merge tools to users, it's useful to be able to easily turn one or all of them off if a problem is discovered. This patch adds support for that. They can of course also be useful for individual users to be able to temporarily turn off a tool they are otherwise using. Differential Revision: https://phab.mercurial-scm.org/D12588
Wed, 04 May 2022 17:40:23 +0100 censor: fix [hg update] away from a revision with censored files stable
Arseniy Alekseyev <aalekseyev@janestreet.com> [Wed, 04 May 2022 17:40:23 +0100] rev 49166
censor: fix [hg update] away from a revision with censored files Differential Revision: https://phab.mercurial-scm.org/D12604
Fri, 22 Apr 2022 14:39:00 +0100 censor: demonstrate a bug stable
Arseniy Alekseyev <aalekseyev@janestreet.com> [Fri, 22 Apr 2022 14:39:00 +0100] rev 49165
censor: demonstrate a bug Differential Revision: https://phab.mercurial-scm.org/D12584
Wed, 04 May 2022 18:17:44 +0200 branching: merge stable into default
Raphaël Gomès <rgomes@octobus.net> [Wed, 04 May 2022 18:17:44 +0200] rev 49164
branching: merge stable into default
Wed, 04 May 2022 18:04:46 +0200 Added signature for changeset 0ddd5e1f5f67 stable
Raphaël Gomès <rgomes@octobus.net> [Wed, 04 May 2022 18:04:46 +0200] rev 49163
Added signature for changeset 0ddd5e1f5f67
Wed, 04 May 2022 18:04:06 +0200 Added tag 6.1.2 for changeset 0ddd5e1f5f67 stable
Raphaël Gomès <rgomes@octobus.net> [Wed, 04 May 2022 18:04:06 +0200] rev 49162
Added tag 6.1.2 for changeset 0ddd5e1f5f67
Wed, 04 May 2022 18:00:01 +0200 ci: remove py2-rust support stable 6.1.2
Raphaël Gomès <rgomes@octobus.net> [Wed, 04 May 2022 18:00:01 +0200] rev 49161
ci: remove py2-rust support Nobody cares about this very narrow usecase, and py2 support is over by July 1st. This helps with the CI load, and removes some flakiness.
Wed, 04 May 2022 17:45:20 +0200 relnotes: add release notes for 6.1.2 stable
Raphaël Gomès <rgomes@octobus.net> [Wed, 04 May 2022 17:45:20 +0200] rev 49160
relnotes: add release notes for 6.1.2
(0) -30000 -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 tip