# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1611741824 -28800
# Node ID 2fce79f5ac71e5568a246ee0e085bd5b0db88158
# Parent  7daa679347986b50a4974ea0cf7630d36a0a2657
changelog: update for 10.2.0

diff -r 7daa67934798 -r 2fce79f5ac71 CHANGELOG
--- a/CHANGELOG	Tue Jan 26 17:14:29 2021 +0100
+++ b/CHANGELOG	Wed Jan 27 18:03:44 2021 +0800
@@ -14,10 +14,21 @@
 10.2.0 - in progress
 --------------------
 
-  * strip: remove experimental.prunestrip option
+  * 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
 --------------------