diff -r bea4c5c3b50c -r 36632d514af2 CHANGELOG
--- a/CHANGELOG	Fri Apr 12 02:07:53 2019 +0200
+++ b/CHANGELOG	Fri Apr 12 02:21:09 2019 +0200
@@ -1,33 +1,31 @@
 Changelog
 =========
 
-8.5.0 - in progress
+8.5.0 -- 2019-04-23
 -------------------
 
-  * evolve: improved support for content-divergence with public changesets,
-  * stack: support ranges in revsets indexing,
-  * pick: add the standard `--tool` option,
-  * stack: improved and speed --children flag up,
-  * stack: mention all divergences too.
-  * evolve: share evolve related cache between `shares`
+  * evolve: fix an recoverable state (issue6053),
+  * evolve: share evolve related cache between `shares`,
+  * evolve: make sure the extensions are only active on repository that
+            enables it (issue6057).
   * evolve: improved compatibility with narrow repositories,
   * evolve: preserve --[no-]update value over --continue,
-  * uncommit: abort if an explicitly given file cannot be uncommitted
-
-8.4.1 - in progress
--------------------
+  * evolve: make sure divergence resolution keep 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),
+  * touch: fix error message when touching public changesets,
+  * uncommit: abort if an explicitly given file cannot be uncommitted.
 
-  * split: preserve phases (issue6048)
-  * evolve: fix an recoverable state (issue6053)
-  * prune: fix error message when pruning public changesets
-  * touch: fix error message when touching public changesets
-  * 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)
-  * pick: align working dir branch with the one from the pick result (issue6089)
+topic 0.14.0
 
-8.4.0 -- 2019-12-22
+  * stack: support ranges in revsets indexing,
+  * stack: mention divergences unstability,
+  * stack: improved and speed --children flag up.
+
+8.4.0 -- 2019-01-22
 -------------------
 
   * compat: add compatibility with Mercurial 4.9