diff CHANGELOG @ 4002:21eab0a99841 mercurial-4.3

test-compat: merge mercurial-4.4 into mercurial-4.3

--- a/CHANGELOG	Fri Aug 03 00:22:50 2018 +0200
+++ b/CHANGELOG	Tue Aug 21 14:09:33 2018 +0200
@@ -1,23 +1,49 @@
 Changelog
 =========
 
-8.1.0 - in progress
+8.1.1 - in progress
+-------------------
+
+  * clone: fix possible crash when using clone bundle and forcing cache warming
+  * evolve: properly set second parent during conflict (issue5927)
+  * next: delete the evolvestate after aborting interrupted `next --evolve`
+  * next: fix topic restriction when passing --evolve
+  * obshashrange: fix speed and consistency issues during cache invalidation
+  * obshashrange: properly persist all caches involved in obshashrange discovery
+  * prune: improve documentation
+
+8.1.0 -- 2018-08-03
 -------------------
 
-  * compatibility with mercurial 4.7rc0
-  * evolve: handle branch changes when solving content divergence,
-  * evolve: improve multiple aspect of divergence resolution
+  * compatibility with mercurial 4.7
+  * evolve: improve multiple aspect of content-divergence resolution
             * branch changes handling,
             * parent changes handling,
+            * description changes handling,
             * divergent stack handling,
-  * evolve: merge commit messages when resolving content divergence (issue5877)
+            * improved resume, stop and abort of divergent resolution
+  * evolve: improved automatic resolution of phase-divergence
+
+  * evolve: add a --update and --no-update flag to evolve to control final
+            working copy parent
+  * evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
   * evolve: show unfinished state information in `hg status -v` (issue5886)
   * evolve: move bookmarks also when updating to successors (issue5923)
+  * evolve: improve orphan resolution when combined with divergence (issue5946)
   * amend: abort `--patch` by saving an empty file (issue5925)
+  *
   * evolve: add a new `--no-update` flag to keep working copy on the initial
             revision.
   * evolve: new help section dedicated to resuming operation interrupted by
             merge conflit, `hg help evolve.interrupted`.
+  * obslog: --filternonlocal
+
+  * rewind: first limited version of `rewind` command to restore stack of commit to a
+            precusors state (check command help for detail and limitation)
+
+topic (0.10.0)
+
+  * display a hint when a topic becomes empty
 
 8.0.1 -- 2018-06-11
 -------------------