diff CHANGELOG @ 5908:e24bdf74cf83

branching: merge with stable

--- a/CHANGELOG	Fri Apr 23 11:55:42 2021 +0200
+++ b/CHANGELOG	Sun Apr 25 23:52:29 2021 +0800
@@ -1,6 +1,23 @@
 Changelog
 =========
 
+10.3.1 -- 2021-04-25
+--------------------
+
+  * 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)
+
+  * packaging: default to using Python 3 in Makefile
+
+topic (0.22.1)
+
+  * compatibility with Mercurial 5.8
+
 10.3.0 -- 2021-03-11
 --------------------