diff -r 653c42af172e -r ac079483153a CHANGELOG
--- a/CHANGELOG	Wed Jun 05 17:42:50 2019 +0200
+++ b/CHANGELOG	Mon Jul 29 11:40:20 2019 +0200
@@ -1,7 +1,17 @@
 Changelog
 =========
 
-8.6.0 - in progress
+9.0.1 - in progress
+-------------------
+
+  * pick: no longer forget file in case of conflict (issue6037)
+  * pick: properly report and cleanup "unfinished state"
+  * prune: don't update wcp if pruned revision are unrelated (issue6137)
+  * prune: spell --successor flag without any unnecessary shortcuts
+  * evolve: properly prune changeset with no change in case of conflict (issue5967)
+  * touch: detect resulting divergence in more cases (issue6107)
+
+9.0.0 -- 2019-06-06
 -------------------
 
   * evolve: preserve the working directory after resolving instability (BC)
@@ -13,9 +23,20 @@
   * evolve: use "unstable" instead of "troubled"
   * evolve: run multiple stabilisation in the same transaction
   * evolve: improve users merging during content-divergence
+  * evolve: reduce the verbosity of `content-divergence` resolution
+  * documentation: various improvement and vocabulary update
+  * packaging: fix documentation build step on debian
+  * progress: improved support in various command
+  * help: avoid duplicated entry for some templates
   * obsdiscovery: drop support for deprecated discovery protocol `obshash`
     (Make sure your servers are configured to use the obshashrange one.
     It is available in evolve 7.2 and above.)
+
+(topic 0.15.0)
+
+  * stack: handle hash sizes when --debug flag is provided
+  * stack: remove 'topic.' prefix from colors/labels (BC)
+  * stack: always provide (full) node hash to non-default --template
   * topic: drop the b# alias. It conflicted with normal hashes.
   * topic: add a `experimental.topic.allow-publish` option (default: True)