# HG changeset patch # User Pierre-Yves David # Date 1564411279 -7200 # Node ID 83d0bed86ced7361d8ca21460cc8bd829033931f # Parent cc96716f2ebfbdd1ac9ebc1c9b4e5989add6346b packaging: groom changelog prior to release diff -r cc96716f2ebf -r 83d0bed86ced CHANGELOG --- a/CHANGELOG Mon Jul 29 14:38:31 2019 +0200 +++ b/CHANGELOG Mon Jul 29 16:41:19 2019 +0200 @@ -1,27 +1,35 @@ Changelog ========= -9.1.0 - in progress +9.1.0 -- 2019-07-29 ------------------- - * evolve: use the same wording as core in case of unresolved conflict - * evolve: minor output message improvements - * evolve: improve `hg evolve --all` behavior when "." is obsolete - * topic: fix confusion in branch heads checking logic - * touch: now works on merge commit too - * rewind: fix behavior for merge commit - * fold: allow fold with merge commit - * metaedit: now also operates on merge commit + * compatibility with upcoming Mercurial 5.1, + + * 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), + * prune: spell --successor flag without any unnecessary shortcuts, + + * evolve: properly prune changeset with no change in case of conflict (issue5967), + * evolve: use the same wording as core in case of unresolved conflict, + * evolve: minor output message improvements, + * evolve: improve `hg evolve --all` behavior when "." is obsolete, -9.0.1 - in progress -------------------- + * touch: detect resulting divergence in more cases (issue6107), + * touch: now works on merge commit too, + + * rewind: fix behavior for merge commit, + + * fold: allow fold with merge commit - * 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) - * prune: spell --successor flag without any unnecessary shortcuts - * evolve: properly prune changeset with no change in case of conflict (issue5967) - * touch: detect resulting divergence in more cases (issue6107) + * metaedit: now also operates on merge commit. + +(topic 0.16.0) + + * topic: fix confusion in branch heads checking logic. + 9.0.0 -- 2019-06-06 -------------------