diff CHANGELOG @ 6687:e2fbec28654c mercurial-5.6

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

--- a/CHANGELOG	Sat Oct 14 13:34:03 2023 -0300
+++ b/CHANGELOG	Sun Feb 04 16:54:39 2024 -0300
@@ -1,13 +1,17 @@
 Changelog
 =========
 
-11.1.0 - in progress
+11.1.0 -- 2023-10-23
 --------------------
 
   * remove deprecated evolve.serveronly extension, evolve extension is
     recommended for all users, clients and servers
 
   * evolve: don't warn about topics while resolving public content-divergence
+  * evolve: add obsdiff as alternative for odiff
+  * evolve: retain certain commit extras when relocating a commit
+
+  * pick: update commit message hashes like other rewrite commands
 
   * evolve, pullbundle: drop compatibility with Mercurial 4.8
 
@@ -16,8 +20,6 @@
   * remove deprecated serverminitopic extension, topic extension is recommended
     for all users, clients and servers
 
-  * pick: update commit message hashes like other rewrite commands
-
   * topic namespaces: add `experimental.tns-allow-rewrite` config option to
     check topic namespace before rewriting changesets (known limitations: does
     not prevent rebase and histedit from editing changesets outside of