Mercurial > evolve
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 4343:11b726506204 | 4344:e5282131a78d |
|---|---|
| 7 * split: improve and update the user prompt (BC) | 7 * split: improve and update the user prompt (BC) |
| 8 * split: make it possible to drop change during a split | 8 * split: make it possible to drop change during a split |
| 9 * split: no longer accept revision with --rev (BC) | 9 * split: no longer accept revision with --rev (BC) |
| 10 * split: accept file patterns | 10 * split: accept file patterns |
| 11 * split: support for non interactive splits | 11 * split: support for non interactive splits |
| 12 * evolve: avoid potential crash when stabilizing orphan merges | |
| 12 * fold: concatenate commit message in revision order | 13 * fold: concatenate commit message in revision order |
| 13 * push: have `--publish` overrule the `auto-publish` config | 14 * push: have `--publish` overrule the `auto-publish` config |
| 14 * next: evolve aspiring children by default (use --no-evolve to skip) | 15 * next: evolve aspiring children by default (use --no-evolve to skip) |
| 15 * next: pick lower part of a split as destination | 16 * next: pick lower part of a split as destination |
| 16 * compat: drop compatibility with Mercurial 4.3 | 17 * compat: drop compatibility with Mercurial 4.3 |