Mercurial > evolve
diff CHANGELOG @ 4348:398c33b17d76
evolve: make sure we don't stop after evolution of obsparent (issue5881)
Before this patch, we were not handling the case when revset
given by user also contain wdir parent which is obsolete.
We were explicitly checking if wdir parent is obsolete, then update
to its successor and return; without checking if we still have
some revisions to be evolved.
This patch make sure that after it update to the successor of
obsolete parent it doesn't stop and continue to evolve other remaining
revisions.
Changes in tests/test-evolve-issue5881.t reflect the fixed behaviour.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Fri, 18 Jan 2019 23:09:44 +0530 |
parents | f45b4c31d81f |
children | 01f4ee6779d5 |
line wrap: on
line diff
--- a/CHANGELOG Fri Jan 18 23:08:43 2019 +0530 +++ b/CHANGELOG Fri Jan 18 23:09:44 2019 +0530 @@ -11,6 +11,7 @@ * 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)