diff CHANGELOG @ 5901:8bd3348c4150 mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7

--- a/CHANGELOG	Thu Mar 11 14:48:12 2021 +0800
+++ b/CHANGELOG	Sun Apr 25 13:21:56 2021 +0800
@@ -1,25 +1,40 @@
 Changelog
 =========
 
-10.3.0 - in progress
+10.3.1 - in progress
 --------------------
 
+  * cache: fix corruption issue when mixing 32-bit and 64-bit environments
+  * next: unstable changesets with a different topic are no longer targets for
+    hg next as long as it's invoked without --no-topic flag
+  * next: when some potential targets are unstable, ask user which changeset
+    they want to update to (only mixing stable and unstable when --evolve flag
+    is given, which is the default)
+
+10.3.0 -- 2021-03-11
+--------------------
+
+  * doc: document stack as a substitue for MQ's qseries
+  * doc: document revsets provided by evolve extension
+
   * 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
---------------------
+topic (0.22.0)
 
-  * doc: document stack as a substitue for MQ's qseries
+  * doc: change topic phrase 'disappear' to 'fade out'
 
 10.2.0.post1 -- 2021-02-01
 --------------------------