diff CHANGELOG @ 3166:e1a230cc4527 mercurial-4.3

test-compat: merge stable into mercurial-4.3

--- a/CHANGELOG	Mon Oct 23 15:50:18 2017 +0200
+++ b/CHANGELOG	Wed Nov 01 23:57:56 2017 +0100
@@ -1,6 +1,23 @@
 Changelog
 =========
 
+7.0.0 - in progress
+-------------------
+
+  * drop compatibility with Mercurial 3.8, 3.9 and 4.0,
+  * drop support for old and deprecated method to exchange obsmarkers,
+  * forbid usage of the old pushbey based protocol to exchange obsmarkers,
+  * evolve: rename '--contentdivergent' flag to '--content-divergent'
+  * evolve: rename '--phasedivergent' flag to '--phase-divergent'
+
+topic
+
+  * add an experimental flag to enforce one head per name policy,
+    (off by default, see 'hg help -e topic' for details)
+  * add an experimental flag to have changesets without topic published on push,
+    (off by default, see 'hg help -e topic' for details)
+  * add a '--publish' flag to `hg push` (4.4+ only),
+
 6.8.0 -- 2017-10-23
 -------------------