diff -r aaa6adbbb47a -r 220e0811b39d CHANGELOG
--- a/CHANGELOG	Tue Apr 24 15:23:15 2018 +0100
+++ b/CHANGELOG	Wed Apr 25 11:55:49 2018 +0100
@@ -4,21 +4,22 @@
 8.0.0 - in progress
 -------------------
 
+  * evolve: a new `--abort` flag which aborts an interrupted evolve
+            resolving orphans,
+  * `hg evolve` now return 0 if there is nothing to evolve,
+  * amend: a new `--patch` flag to make changes to wdir parent by editing patch,
+  * evolve: fixed some memory leak issue,
+  * evolve: prevent some crash with merge and split (issue5833 and issue5832),
+  * evolve: improvemed support for solving phase-divergence situation,
+  * evolve: improvemed support for solving orphan situation,
+  * obsdiscovery: added unit to various progress bar,
+  * evolve: record "operation" for command where it was missing,
+
   * drop support for Mercurial 4.1 and 4.2
   * `--obsolete` and `--old-obsolete` flags for `hg graft` are dropped
-  * evolve: a new `--abort` flag which aborts an interrupted evolve
-            resolving orphans
-  * `hg evolve` now return 0 if there is nothing to evolve
-  * amend: a new `--patch` flag to make changes to wdir parent by editing patch
-
-  * fixed some memory leak issue
-
   * templatekw: remove `obsfatedata` templatekw. Individuals fields are
     available in core as single template functions.
-
-  * fixed issue 5833 and 5832
-
-  * topic: restring name to letter, '-', '_' and '.'
+  * topic: restraining name to letter, '-', '_' and '.'
 
 7.3.0 -- 2018-03-21
 ---------------------