--- a/CHANGELOG	Tue Jan 22 12:54:41 2019 -0500
+++ b/CHANGELOG	Thu Apr 11 22:41:25 2019 +0200
@@ -1,33 +1,55 @@
 Changelog
 =========
 
-8.4.0 - in progress
+8.5.0 - in progress
 -------------------
 
-  * split: improve and update the user prompt (BC)
-  * split: make it possible to drop change during a split
-  * split: no longer accept revision with --rev (BC)
-  * split: accept file patterns
-  * split: support for non interactive splits
+  * evolve: fix an recoverable state (issue6053)
+  * evolve: share evolve related cache between `shares`
+  * evolve: improved compatibility with narrow repositories,
+  * evolve: preserve --[no-]update value over --continue,
+  * evolve: make sure the extensions are only active on repository that
+            enables it. Double check your server configuration (issue6057)
+  * evolve: make sure divergence resolution don't replace the initial author
+            (issue6113)
+  * evolve: improved support for content-divergence with public changesets,
+  * pick: align working dir branch with the one from the pick result (issue6089)
+  * pick: add the standard `--tool` option,
+  * prune: fix error message when pruning public changesets
+  * split: preserve phases (issue6048)
+  * stack: improved and speed --children flag up,
+  * stack: mention all divergences too.
+  * stack: support ranges in revsets indexing,
+  * touch: fix error message when touching public changesets
+  * uncommit: abort if an explicitly given file cannot be uncommitted
+
+8.4.0 -- 2019-12-22
+-------------------
+
+  * compat: add compatibility with Mercurial 4.9
+  * compat: drop compatibility with Mercurial 4.3
   * evolve: avoid potential crash when stabilizing orphan merges
-  * evolve: pick right destination in split+prune cases issue5686 (4.9 only)
+  * evolve: pick right destination in split+prune cases issue5686 (hg-4.9 only)
   * evolve: prioritize --rev/--any/--all option over obsolete working directory
   * fold: concatenate commit message in revision order
-  * push: have `--publish` overrule the `auto-publish` config
   * next: evolve aspiring children by default (use --no-evolve to skip)
   * next: pick lower part of a split as destination
-  * compat: drop compatibility with Mercurial 4.3
-  * compat: add compatibility with Mercurial 4.9
-
-topic:
+  * push: have `--publish` overrule the `auto-publish` config
+  * split: accept file patterns
+  * split: improve and update the user prompt (BC)
+  * split: make it possible to drop change during a split
+  * split: no longer accept revision without --rev (BC)
+  * split: support for non interactive splits
 
-  * topics: improve the message around topic changing
+topic 0.13.0
+
   * stack: introduce a --children flag (see help for details)
+  * stack: support for '#stack[idx]' absolute indexing in revset (hg-4.9+ only)
+  * topic: support for '#topic[idx]' relative indexing in revset (hg-4.9+ only)
   * topic: make --age compatible with the usual other display for `hg topic`
-  * stack: support for '#stack[idx]' absolute indexing in revset (4.9+ only)
-  * topic: support for '#topic[idx]' relative indexing in revset (4.9+ only)
+  * topics: improve the message around topic changes
 
-8.3.3 -- 2017-12-24
+8.3.3 -- 2018-12-24
 -------------------
 
   * evolve: properly detect unresolved merge conflict (issue-5966)
@@ -35,7 +57,7 @@
   * test: avoid leaking `hg serve` process
   * topic: fix error message for the `ngtip` revset
 
-8.3.2 -- 2017-11-27
+8.3.2 -- 2018-11-27
 -------------------
 
   * evolve: not longer attempt to translate revision's descriptions (issue6016)