Mercurial > evolve
comparison CHANGELOG @ 4779:85a97f37c78f mercurial-5.0
branching: merge the two mercurial-5.0 heads
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 29 Jul 2019 14:42:49 +0200 |
| parents | 184c64c81528 076b6813a7ea |
| children | 83d0bed86ced |
comparison
equal
deleted
inserted
replaced
| 4778:1340d6718a88 | 4779:85a97f37c78f |
|---|---|
| 17 ------------------- | 17 ------------------- |
| 18 | 18 |
| 19 * pick: no longer forget file in case of conflict (issue6037) | 19 * pick: no longer forget file in case of conflict (issue6037) |
| 20 * pick: properly report and cleanup "unfinished state" | 20 * pick: properly report and cleanup "unfinished state" |
| 21 * prune: don't update wcp if pruned revision are unrelated (issue6137) | 21 * prune: don't update wcp if pruned revision are unrelated (issue6137) |
| 22 * prune: spell --successor flag without any unnecessary shortcuts | |
| 22 * evolve: properly prune changeset with no change in case of conflict (issue5967) | 23 * evolve: properly prune changeset with no change in case of conflict (issue5967) |
| 23 * touch: detect resulting divergence in more cases (issue6107) | 24 * touch: detect resulting divergence in more cases (issue6107) |
| 24 | 25 |
| 25 9.0.0 -- 2019-06-06 | 26 9.0.0 -- 2019-06-06 |
| 26 ------------------- | 27 ------------------- |