Mercurial > evolve
diff CHANGELOG @ 4702:fcecbb1261f2 stable
evolve: fix the inconsistent behaviour of prune (issue6137)
Let's not update to any revision when working directory parent
is not related to the revision being pruned.
Changes in test file demonstrate the fixed behaviour.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Mon, 01 Jul 2019 19:15:57 +0530 |
parents | a9cf0ba6e6c7 |
children | de194ed973ba ef8907df73fc |
line wrap: on
line diff
--- a/CHANGELOG Tue Jul 02 21:00:46 2019 +0530 +++ b/CHANGELOG Mon Jul 01 19:15:57 2019 +0530 @@ -6,6 +6,7 @@ * 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) * evolve: properly prune changeset with no change in case of conflict (issue5967) 9.0.0 -- 2019-06-06