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"
Sat, 18 Aug 2018 00:53:12 +0200 compat: drop compatibility layer for updatecaches
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 18 Aug 2018 00:53:12 +0200] rev 3968
compat: drop compatibility layer for updatecaches The `repo.updatecaches` method is support since Mercurial 4.2
Sat, 18 Aug 2018 00:48:05 +0200 branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 18 Aug 2018 00:48:05 +0200] rev 3967
branching: merge with stable
Fri, 17 Aug 2018 16:26:44 +0200 obshashrange: force saving of stablesort and firstmerge cache stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 17 Aug 2018 16:26:44 +0200] rev 3966
obshashrange: force saving of stablesort and firstmerge cache For some reason the check in repo is not working for stable sort. We also force firstmerge to be saved as test show it was missing.
(0) -3000 -1000 -300 -100 -16 +16 +100 +300 +1000 tip