diff CHANGELOG @ 6696:e0712a00154e

branching: merge with stable

--- a/CHANGELOG	Fri Feb 02 00:12:49 2024 +0100
+++ b/CHANGELOG	Wed Feb 07 14:57:11 2024 -0300
@@ -7,6 +7,33 @@
   * evolve: remove legacy.py that could be used to "detect and convert
     prehistoric format of obsolete markers" (older than Mercurial 2.3)
 
+11.1.1 -- 2024-02-05
+--------------------
+
+  * compatibility with Mercurial 6.6
+
+  * evolve: fix typo in "mercurial" and let hasmemmergestate be True sometimes
+
+  * uncommit: set uncommit_source extra consistently in interactive mode
+
+topic (1.1.1)
+
+  * compatibility with Mercurial 6.6
+
+  * topic: properly decode topic and topic namespace after reading from disk
+  * topic: wrap makebundlerepository() to wrap bundlerepository class
+    (issue6856)
+  * topic: internal config option to fix hg pick behavior (issue6406)
+  * topic: use the appropriate functions to change topic and topic namespace on
+    working directory update and don't write empty/default values to disk
+
+  * topic namespaces: check that user-provided topic namespace names are
+    human-readable like topics
+  * topic namespaces: add tns_heads method to wirepeer directly instead of
+    using a subclass
+  * topic namespaces: remove .hg/topic-namespace file if it has the default
+    value ("none")
+
 11.1.0 -- 2023-10-23
 --------------------