Tue, 21 Aug 2018 15:29:32 +0200 Added tag 8.1.1 for changeset e7abf863e113 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 21 Aug 2018 15:29:32 +0200] rev 3998
Added tag 8.1.1 for changeset e7abf863e113
Tue, 21 Aug 2018 15:29:13 +0200 packaging: prepare release 8.1.1 stable 8.1.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 21 Aug 2018 15:29:13 +0200] rev 3997
packaging: prepare release 8.1.1 Topic is untouched so we keep the previous version number.
Tue, 21 Aug 2018 14:23:47 +0200 branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 21 Aug 2018 14:23:47 +0200] rev 3996
branching: merge with stable
Tue, 21 Aug 2018 13:26:35 +0200 test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 21 Aug 2018 13:26:35 +0200] rev 3995
test-compat: merge mercurial-4.5 into mercurial-4.4
Tue, 21 Aug 2018 13:25:29 +0200 test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 21 Aug 2018 13:25:29 +0200] rev 3994
test-compat: merge mercurial-4.6 into mercurial-4.5
Tue, 21 Aug 2018 13:25:28 +0200 test-compat: merge stable into mercurial-4.6 mercurial-4.6
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 21 Aug 2018 13:25:28 +0200] rev 3993
test-compat: merge stable into mercurial-4.6
Tue, 21 Aug 2018 13:18:52 +0200 changelog: add a line about improved prune documentation stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 21 Aug 2018 13:18:52 +0200] rev 3992
changelog: add a line about improved prune documentation
Tue, 21 Aug 2018 13:17:27 +0200 changelog: reorder content stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 21 Aug 2018 13:17:27 +0200] rev 3991
changelog: reorder content
Tue, 21 Aug 2018 12:13:28 +0200 prune: more human-friendly documentation stable
Dan Villiom Podlaski Christiansen <dan@magenta.dk> [Tue, 21 Aug 2018 12:13:28 +0200] rev 3990
prune: more human-friendly documentation The previous help string generally had a highly technical language. I've tried my best to address that.
Tue, 21 Aug 2018 12:14:04 +0200 prune: improve help first line stable
Dan Villiom Podlaski Christiansen <dan@magenta.dk> [Tue, 21 Aug 2018 12:14:04 +0200] rev 3989
prune: improve help first line The previous help string for prune didn't mention successors in the first line. Note: Pierre-Yves David changed the original "hidden" to "obsolete" as it is better concept to put forward. (a bit more specific and with more consequence than just "hidden"). We need a good `hg help obsolete/obsolescence` result. We'll try to get this in the next version.
Tue, 21 Aug 2018 12:21:05 +0200 prune: try to clarify the "multi" revisions case stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 21 Aug 2018 12:21:05 +0200] rev 3988
prune: try to clarify the "multi" revisions case I hope this highlight the use case for all three options.
Tue, 21 Aug 2018 12:21:59 +0200 prune: move help about biject after the one about split and fold stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 21 Aug 2018 12:21:59 +0200] rev 3987
prune: move help about biject after the one about split and fold The --biject flag seems a less common use case.
Tue, 21 Aug 2018 12:18:11 +0200 prune: no longer consider dropping --biject stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 21 Aug 2018 12:18:11 +0200] rev 3986
prune: no longer consider dropping --biject Field testing show it save people one wrong call often enough that it is worth keeping.
Tue, 21 Aug 2018 12:13:01 +0200 prune: more human-friendly documentation for --biject stable
Dan Villiom Podlaski Christiansen <dan@magenta.dk> [Tue, 21 Aug 2018 12:13:01 +0200] rev 3985
prune: more human-friendly documentation for --biject
Tue, 21 Aug 2018 11:56:49 +0200 prune: use ``-s/--succ`` in documentation stable
Dan Villiom Podlaski Christiansen <dan@magenta.dk> [Tue, 21 Aug 2018 11:56:49 +0200] rev 3984
prune: use ``-s/--succ`` in documentation Extracted by Pierre-Yves David
Tue, 21 Aug 2018 04:08:38 +0200 branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 21 Aug 2018 04:08:38 +0200] rev 3983
branching: merge with stable
Tue, 21 Aug 2018 04:05:12 +0200 compat: import the module dagutil module in evolve
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 21 Aug 2018 04:05:12 +0200] rev 3982
compat: import the module dagutil module in evolve Discovery code is core have been rewritten to no longer depends on dagutil and the module have been removed. This break evolve's obsmarker discovery (older version of the discovery use the same concept).. A quick work around is to import the dagutil module in evolve and use that for now.
Mon, 20 Aug 2018 12:21:39 +0300 evolve: delete evolvestate after aborting interrupted `next --evolve` stable
Pulkit Goyal <pulkit@yandex-team.ru> [Mon, 20 Aug 2018 12:21:39 +0300] rev 3981
evolve: delete evolvestate after aborting interrupted `next --evolve` We didn't use to delete the evolvestate after aborting an interrupted `next --evolve`. This patch makes sure we do that. The test changes demonstrate the fix and we add a CHANGELOG entry about the fix.
Mon, 20 Aug 2018 12:19:05 +0300 tests: check that we delete evolvestate correctly after abort/stop stable
Pulkit Goyal <pulkit@yandex-team.ru> [Mon, 20 Aug 2018 12:19:05 +0300] rev 3980
tests: check that we delete evolvestate correctly after abort/stop This patch adds test to check whether we delete the evolvestate correctly after aborting or stopping an interrupted evolve which is caused because of `next --evolve`.
Mon, 20 Aug 2018 23:04:37 +0200 changelog: update with issue5927 fix stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 20 Aug 2018 23:04:37 +0200] rev 3979
changelog: update with issue5927 fix
Sat, 18 Aug 2018 21:03:45 +0530 evolve: set the second parent if we get conflicts while evolving stable
Pulkit Goyal <pulkit@yandex-team.ru> [Sat, 18 Aug 2018 21:03:45 +0530] rev 3978
evolve: set the second parent if we get conflicts while evolving This patch makes sure we set the second parent correctly if we run into conflicts while evolving. Also, we need to make sure to reset to one parent before committing.
Sat, 18 Aug 2018 21:01:14 +0530 evolvecmd: import mercurial.node module as nodemod stable
Pulkit Goyal <pulkit@yandex-team.ru> [Sat, 18 Aug 2018 21:01:14 +0530] rev 3977
evolvecmd: import mercurial.node module as nodemod We use node as a variable name at few places and the conflicts with variable name are not good. Moreover this practice is followed in core mercurial also.
Sat, 18 Aug 2018 20:24:41 +0530 tests: demonstrate the interrupted evolve does not set p2 stable
Pulkit Goyal <pulkit@yandex-team.ru> [Sat, 18 Aug 2018 20:24:41 +0530] rev 3976
tests: demonstrate the interrupted evolve does not set p2 This patch adds a test to demonstrate issue5927 which is about evolving not setting p2 correctly in interruption.
Sat, 18 Aug 2018 01:32:52 +0200 cleanup: remove unused import
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 18 Aug 2018 01:32:52 +0200] rev 3975
cleanup: remove unused import
Sat, 18 Aug 2018 01:03:19 +0200 cleanup: remove old comment that lost all meaning
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 18 Aug 2018 01:03:19 +0200] rev 3974
cleanup: remove old comment that lost all meaning
Sat, 18 Aug 2018 01:02:52 +0200 template: remove compatibility layer for `showobsolete`
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 18 Aug 2018 01:02:52 +0200] rev 3973
template: remove compatibility layer for `showobsolete` The keyword exist in core since 4.2
Sat, 18 Aug 2018 01:06:30 +0200 exthelper: drop compatibility layer for `command`
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 18 Aug 2018 01:06:30 +0200] rev 3972
exthelper: drop compatibility layer for `command` We dropped support for 4.2.
Sat, 18 Aug 2018 01:05:00 +0200 topic: drop compat layer for `command`
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 18 Aug 2018 01:05:00 +0200] rev 3971
topic: drop compat layer for `command` We dropped support for 4.2
Sat, 18 Aug 2018 01:00:08 +0200 legacy: drop compat layer for "command"
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 18 Aug 2018 01:00:08 +0200] rev 3970
legacy: drop compat layer for "command"
Sat, 18 Aug 2018 00:59:44 +0200 drophack: drop compat layer for "command"
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 18 Aug 2018 00:59:44 +0200] rev 3969
drophack: drop compat layer for "command"
(0) -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 tip