# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1670853649 -14400
# Node ID 333ad3793ef32137102b7d3f1fee213f08aa01af
# Parent  e959390490c28a33fbe358bebd5e7a2eec261723# Parent  7933292aa102e19344d8f29b2f092dcd77d0a5b7
branching: merge with stable

diff -r e959390490c2 -r 333ad3793ef3 CHANGELOG
--- a/CHANGELOG	Fri Dec 09 15:01:59 2022 +0400
+++ b/CHANGELOG	Mon Dec 12 18:00:49 2022 +0400
@@ -23,6 +23,9 @@
     SQLite databases) slightly more tolerant to FS issues (issue6246)
   * evolve: adapt to Python 3.11 BC breakage with `random.sample()`
 
+  * next: properly handle cases when user selects an aspiring child, making
+    sure that the destination is evolved when needed
+
 topic (0.24.2)
 
   * compatibility with Mercurial 6.3
@@ -30,9 +33,6 @@
   * topic: invalidate the topic cache when branchcache is invalidated, to fix
     an issue in TortoiseHg where stale topic labels appear in certain cases
 
-  * next: properly handle cases when user selects an aspiring child, making
-    sure that the destination is evolved when needed
-
 10.5.2 -- 2022-07-13
 --------------------