CHANGELOG
branchstable
changeset 5149 3f40b39d091e
parent 5147 83b607a9296d
child 5152 583dc6ef3eb2
--- a/CHANGELOG	Wed Mar 04 16:36:32 2020 +0100
+++ b/CHANGELOG	Wed Mar 04 16:53:32 2020 +0100
@@ -4,17 +4,24 @@
 9.3.0 - in progress
 -------------------
 
+  * compat: compatibility with Mercurial 5.3
   * compat: drop compatibility with Mercurial 4.5
+  * compat: cleanup old compatibility code for Mercurial < 4.5
+
   * evolve: extensive cleanup of functions, template keywords and compatibility
     code related to obsfate and successorssets
+  * evolve: add content divergence checking to the standard pre-rewrite check
+  * evolve: improve the message associated with content divergence
+  * evolve: correctly handle --continue and --stop when relocating
+    content-divergent changesets
+
   * exchange: dropped more bundle-1 related dead code
+
   * help: categorizing evolve and topic commands
+
   * obslog: make templatable
   * obslog: show folds and use more specific verbs when possible
-  * compat: cleanup some compatibility code for mercurial < 4.5
-  * compat: compatibility with some changes of the upcoming Mercurial 5.3
-  * evolve: add content divergence checking to the standard pre-rewrite check,
-  * evolve: improve the message associated with content divergence.
+
   * topic: add a `experimental.topic.server-gate-topic-changesets` config
 
 9.2.2 -- 2020-01-31