changeset 4510:0b86c05440e9 stable

changelog: merge 8.4.1 and 8.5.1 entries

--- a/CHANGELOG	Thu Apr 11 21:43:37 2019 +0200
+++ b/CHANGELOG	Thu Apr 11 22:41:06 2019 +0200
@@ -4,28 +4,24 @@
 8.5.0 - in progress
 -------------------
 
-  * evolve: improved support for content-divergence with public changesets,
-  * stack: support ranges in revsets indexing,
-  * pick: add the standard `--tool` option,
-  * stack: improved and speed --children flag up,
-  * stack: mention all divergences too.
+  * evolve: fix an recoverable state (issue6053)
   * evolve: share evolve related cache between `shares`
   * evolve: improved compatibility with narrow repositories,
   * evolve: preserve --[no-]update value over --continue,
-  * uncommit: abort if an explicitly given file cannot be uncommitted
-
-8.4.1 - in progress
--------------------
-
-  * split: preserve phases (issue6048)
-  * evolve: fix an recoverable state (issue6053)
-  * prune: fix error message when pruning public changesets
-  * touch: fix error message when touching public changesets
   * evolve: make sure the extensions are only active on repository that
             enables it. Double check your server configuration (issue6057)
   * evolve: make sure divergence resolution don't replace the initial author
             (issue6113)
+  * evolve: improved support for content-divergence with public changesets,
   * pick: align working dir branch with the one from the pick result (issue6089)
+  * pick: add the standard `--tool` option,
+  * prune: fix error message when pruning public changesets
+  * split: preserve phases (issue6048)
+  * stack: improved and speed --children flag up,
+  * stack: mention all divergences too.
+  * stack: support ranges in revsets indexing,
+  * touch: fix error message when touching public changesets
+  * uncommit: abort if an explicitly given file cannot be uncommitted
 
 8.4.0 -- 2019-12-22
 -------------------