diff CHANGELOG @ 6566:cb009f13126a

branching: merge with stable
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 11 Oct 2023 13:45:08 -0300
parents b56489871a56 e6a18e1cafe8
children 851f1af306a5
line wrap: on
line diff
--- a/CHANGELOG	Sat Sep 30 15:41:05 2023 -0300
+++ b/CHANGELOG	Wed Oct 11 13:45:08 2023 -0300
@@ -7,6 +7,8 @@
   * remove deprecated evolve.serveronly extension, evolve extension is
     recommended for all users, clients and servers
 
+  * evolve: don't warn about topics while resolving public content-divergence
+
   * evolve, pullbundle: drop compatibility with Mercurial 4.8
 
 topic (1.1.0)
@@ -14,6 +16,11 @@
   * remove deprecated serverminitopic extension, topic extension is recommended
     for all users, clients and servers
 
+  * topic: only set topic on workingcommitctx if it doesn't already have one
+  * topic: properly process revbranchcache before sending it to peers
+    (issue6841)
+  * topic: invalidate topic namespace cache in repo.invalidatecaches()
+
   * drop compatibility with Mercurial 4.8
 
 11.0.2 -- 2023-07-05