branch | stable |
changeset 4728 | ef8907df73fc |
parent 4702 | fcecbb1261f2 |
child 4729 | 076b6813a7ea |
child 4763 | 184c64c81528 |
--- a/CHANGELOG Sat Jun 29 14:28:35 2019 +0530 +++ b/CHANGELOG Wed Jul 17 17:58:44 2019 +0200 @@ -8,6 +8,7 @@ * 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) + * touch: detect resulting divergence in more cases (issue6107) 9.0.0 -- 2019-06-06 -------------------