branch | stable |
changeset 4702 | fcecbb1261f2 |
parent 4692 | a9cf0ba6e6c7 |
child 4706 | de194ed973ba |
child 4728 | ef8907df73fc |
--- 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