diff CHANGELOG @ 4422:62a6f8f4e694

branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 04 Mar 2019 12:30:15 +0100
parents 054ff759f2fd a56caab87e37
children da2fdaa3d97c
line wrap: on
line diff
--- a/CHANGELOG	Sat Mar 02 02:34:29 2019 +0530
+++ b/CHANGELOG	Mon Mar 04 12:30:15 2019 +0100
@@ -1,13 +1,19 @@
 Changelog
 =========
 
-8.4.0 - in progress
+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
 
+8.4.1 - in progress
+-------------------
+
+  * split: preserve phases (issue6048)
+  * evolve: fix an recoverable state (issue6053)
+
 8.4.0 -- 2019-12-22
 -------------------