diff CHANGELOG @ 5824:73573aec18f7 mercurial-5.5

test-compat: merge mercurial-5.6 into mercurial-5.5

# no-check-commit

--- a/CHANGELOG	Sat Jan 30 20:32:38 2021 +0800
+++ b/CHANGELOG	Thu Mar 11 12:40:20 2021 +0800
@@ -1,35 +1,54 @@
 Changelog
 =========
 
-10.1.1 -- in progress
----------------------
+10.3.0 - in progress
+--------------------
+
+  * evolve: add a experimental.evolution.in-memory config for running evolve
+    in memory (hg >= 5.6)
+  * evolve: improve content-divergence resolution that involves parent changes
+  * evolve: preserve wdir parent when using `hg evolve --stop`
+  * obslog: clarify the command name in the help,
+  * pdiff, pstatus: drop some irrelevant command flags inherited from `hg diff`
+    and `hg status` respectively
+  * rewind: detect and abort on cases when we rewind to changesets that are
+    precessors / successors of each other
+  * rewind: when user gives only some parts of a fold, include the other parts
+    as well, or abort if they are missing from local repo
+
+10.2.1 - in progress
+--------------------
+
+  * doc: document stack as a substitue for MQ's qseries
+
+10.2.0.post1 -- 2021-02-01
+--------------------------
+
+same content as 10.2.0, but with a valid tarball on pypi.
+
+10.2.0 -- 2021-02-01
+--------------------
+
+  * compatibility with Mercurial 5.7
 
   * doc: update the MQ To Evolve guide and fix build warning for index.rst
 
+  * evolve: improve resolution of some case of parent divergence
+  * evolve: respect command-templates.oneline-summary if configured
   * evolve: remove spurious "working directory is now at ..." messages
   * evolve: various documentation improvements
 
   * packaging: default to building docs on Python 3
 
-topic:
+  * strip: remove experimental.prunestrip option
+
+topic (0.21.0)
+
+  * performance: speed up various operations using an in-memory cache for topic
 
   * 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