diff -r c63f47a4f5ec -r de194ed973ba CHANGELOG --- 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 -------------------