diff CHANGELOG @ 4660:b62ed7c69561

branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 04 Jun 2019 11:08:44 +0200
parents 228caeb8b7af
children a1a8adcd5155
line wrap: on
line diff
--- a/CHANGELOG	Sat Jun 01 02:30:14 2019 +0200
+++ b/CHANGELOG	Tue Jun 04 11:08:44 2019 +0200
@@ -1,6 +1,24 @@
 Changelog
 =========
 
+8.6.0 - in progress
+-------------------
+
+  * evolve: preserve the working directory after resolving instability (BC)
+            (use `hg next` or `hg evolve --update` to get the old behavior)
+  * evolve: evolve all relevant revision by default (BC)
+            (use --no-all to evolve only one)
+  * evolve: drop compatibility with 4.4
+  * evolve: reinstalled compatibility with narrow repositories,
+  * evolve: use "unstable" instead of "troubled"
+  * evolve: run multiple stabilisation in the same transaction
+  * evolve: improve users merging during content-divergence
+  * obsdiscovery: drop support for deprecated discovery protocol `obshash`
+    (Make sure your servers are configured to use the obshashrange one.
+    It is available in evolve 7.2 and above.)
+  * topic: drop the b# alias. It conflicted with normal hashes.
+  * topic: add a `experimental.topic.allow-publish` option (default: True)
+
 8.5.1 -- 2019-04-23
 -------------------