Mercurial > evolve

diff CHANGELOG @ 4706:de194ed973ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 04 Jul 2019 16:55:57 +0200
parents 5f90eb8fd63c fcecbb1261f2
children 0e0731406efd
line wrap: on
line diff
--- a/CHANGELOG	Wed Jun 26 21:11:25 2019 +0530
+++ b/CHANGELOG	Thu Jul 04 16:55:57 2019 +0200
@@ -9,6 +9,13 @@
   * evolve: improve `hg evolve --all` behavior when "." is obsolete
   * topic: fix confusion in branch heads checking logic
 
+9.0.1 - in progress
+-------------------
+
+  * pick: no longer forget file in case of conflict (issue6037)
+  * pick: properly report and cleanup "unfinished state"
+  * prune: don't update wcp if pruned revision are unrelated (issue6137)
+  * evolve: properly prune changeset with no change in case of conflict (issue5967)
 
 9.0.0 -- 2019-06-06
 -------------------