diff CHANGELOG @ 5737:0c6bb79da287 stable

branching: merge into stable in preparation for release

# no-check-commit

--- a/CHANGELOG	Fri Jan 29 19:23:47 2021 +0800
+++ b/CHANGELOG	Sat Jan 30 20:20:23 2021 +0800
@@ -16,6 +16,24 @@
   * rebase: prevent in-memory rebase from silently dropping topic (by disabling
     the feature)
 
+10.2.0 - in progress
+--------------------
+
+  * compatibility with Mercurial 5.7
+
+  * evolve: improve resolution of some case of parent divergence
+  * evolve: respect command-templates.oneline-summary if configured
+
+  * strip: remove experimental.prunestrip option
+
+topic:
+
+  * performance: speed up various operations using an in-memory cache for topic
+
+  * topic: rework how ctx.branch() is wrapped
+  * topic: look for topic heads only when necessary, this fixes the output of
+    e.g. hg heads when topics are in play
+
 10.1.0 -- 2020-10-31
 --------------------