# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1633632629 -10800
# Node ID 441e7e773d6c42737bf2e07d8967c49eab954792
# Parent  761124310764afd0fe7659cb328992bd4bdf6f75
changelog: add more entries from default branch to 10.4.0

diff -r 761124310764 -r 441e7e773d6c CHANGELOG
--- a/CHANGELOG	Mon Oct 11 10:58:51 2021 +0300
+++ b/CHANGELOG	Thu Oct 07 21:50:29 2021 +0300
@@ -4,17 +4,24 @@
 10.4.0 - in progress
 --------------------
 
-  * next: add an --abort flag
   * evolve: use a more stable criteria for picking p1 when solving
-            content-divergence (most recent evolution will be used).
+    content-divergence (most recent evolution will be used)
   * evolve: drop the deprecated --unstable, --divergent and --bumped flags,
     they were replaced by --orphan, --content-divergent and --phase-divergent
     respectively a long time ago
   * evolve: remove experimental.obshashrange.lru-size docs, that config option
     didn't do anything for a long time
+  * evolve: use precheck function from Mercurial 5.9+ when available, mostly
+    affects error messages and exit codes
+
+  * next: add an --abort flag
 
   * evolve, topic, pullbundle: drop compatibility with Mercurial 4.6
 
+topic (0.23.0)
+
+  * topic: drop old code for working with amends on ancient hg versions (~3.6)
+
 10.3.3 -- 2021-08-13
 --------------------