diff CHANGELOG @ 6928:361dcfcb3f08

branching: merge with stable

--- a/CHANGELOG	Sun Sep 22 02:58:54 2024 +0200
+++ b/CHANGELOG	Sat Oct 26 11:19:50 2024 +0400
@@ -7,6 +7,23 @@
   * evolve: remove legacy.py that could be used to "detect and convert
     prehistoric format of obsolete markers" (older than Mercurial 2.3)
 
+11.1.5 -- 2024-10-26
+--------------------
+
+  * compatibility with Mercurial 6.9
+
+  * evolve: check that the evolved revisions are indeed in the repo during
+    abort, fixes an issue when trying to access them during cleanup step
+
+  * docs: update installation instructions due to PEP 668
+  * docs: minor edits and fixes in evolve and topic tutorials
+
+  * tests: more tests related to Python packaging
+
+topic (1.1.5)
+
+  * compatibility with Mercurial 6.9
+
 11.1.4 -- 2024-06-28
 --------------------