Mercurial > evolve
diff CHANGELOG @ 4344:e5282131a78d
evolve: cover the orphanmerge part missed by lastsolved
Let's cover the orphanmerge part also as it was missed
at the time when we introduced "lastsolved".
Chagnes in test-evolve.t reflect the fixed behaviour.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Tue, 25 Dec 2018 14:35:54 +0530 |
parents | 5300be965515 |
children | f45b4c31d81f |
line wrap: on
line diff
--- a/CHANGELOG Thu Jan 17 16:20:35 2019 +0530 +++ b/CHANGELOG Tue Dec 25 14:35:54 2018 +0530 @@ -9,6 +9,7 @@ * 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 * 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)