test-compat: merge stable into mercurial-4.6 mercurial-4.6
authorPierre-Yves David <pierre-yves.david@octobus.net>
Tue, 31 Jul 2018 12:54:46 +0200
branchmercurial-4.6
changeset 3919 e2321901592d
parent 3913 9bc01ec6fc54 (current diff)
parent 3915 3d0fa4a94871 (diff)
child 3920 202413cab59f
test-compat: merge stable into mercurial-4.6
--- a/CHANGELOG	Tue Jul 31 12:07:39 2018 +0200
+++ b/CHANGELOG	Tue Jul 31 12:54:46 2018 +0200
@@ -4,15 +4,16 @@
 8.1.0 - in progress
 -------------------
 
+  * compatibility with mercurial 4.7rc0
   * evolve: handle branch changes when solving content divergence,
   * evolve: improve multiple aspect of divergence resolution
             * branch changes handling,
             * parent changes handling,
             * divergent stack handling,
-  * evolve: add a help section dedicated to interrupted evolve,
   * evolve: merge commit messages when resolving content divergence (issue5877)
   * evolve: show unfinished state information in `hg status -v` (issue5886)
   * evolve: move bookmarks also when updating to successors (issue5923)
+  * 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