Mercurial > evolve
diff CHANGELOG @ 4359:2cbb9914d227 mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 22 Jan 2019 12:54:43 -0500 |
parents | 45a6890ca656 |
children | 8c4289d0e91e |
line wrap: on
line diff
--- a/CHANGELOG Mon Dec 24 17:47:27 2018 +0100 +++ b/CHANGELOG Tue Jan 22 12:54:43 2019 -0500 @@ -1,7 +1,33 @@ Changelog ========= -8.3.3 - in progress +8.4.0 - in progress +------------------- + + * split: improve and update the user prompt (BC) + * split: make it possible to drop change during a split + * split: no longer accept revision with --rev (BC) + * split: accept file patterns + * split: support for non interactive splits + * evolve: avoid potential crash when stabilizing orphan merges + * evolve: pick right destination in split+prune cases issue5686 (4.9 only) + * evolve: prioritize --rev/--any/--all option over obsolete working directory + * fold: concatenate commit message in revision order + * push: have `--publish` overrule the `auto-publish` config + * next: evolve aspiring children by default (use --no-evolve to skip) + * next: pick lower part of a split as destination + * compat: drop compatibility with Mercurial 4.3 + * compat: add compatibility with Mercurial 4.9 + +topic: + + * topics: improve the message around topic changing + * stack: introduce a --children flag (see help for details) + * topic: make --age compatible with the usual other display for `hg topic` + * stack: support for '#stack[idx]' absolute indexing in revset (4.9+ only) + * topic: support for '#topic[idx]' relative indexing in revset (4.9+ only) + +8.3.3 -- 2017-12-24 ------------------- * evolve: properly detect unresolved merge conflict (issue-5966)