Mercurial > evolve
comparison CHANGELOG @ 3836:b91db6989231
branching: merge with stable
Merging with the new 8.0.1 release.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 12 Jun 2018 10:40:57 +0200 |
| parents | 1de50022e888 0887c30255a1 |
| children | ac0717f23921 |
comparison
equal
deleted
inserted
replaced
| 3832:fb821ed44f86 | 3836:b91db6989231 |
|---|---|
| 6 | 6 |
| 7 * evolve: handle branch changes when solving content divergence, | 7 * evolve: handle branch changes when solving content divergence, |
| 8 * evolve: add a help section dedicated to interrupted evolve, | 8 * evolve: add a help section dedicated to interrupted evolve, |
| 9 * evolve: merge commit messages when resolving content divergence (issue5877) | 9 * evolve: merge commit messages when resolving content divergence (issue5877) |
| 10 | 10 |
| 11 8.0.1 -- in-progress | 11 8.0.1 -- 2018-06-11 |
| 12 --------------------- | 12 ------------------- |
| 13 | 13 |
| 14 * compatibility with mercurial 4.6.1 | |
| 14 * next-prev: respect commands.update.check config option (issue5808) | 15 * next-prev: respect commands.update.check config option (issue5808) |
| 15 * next-prev: fix `evolve --abort` on conflicts (issue5897) | 16 * next-prev: fix `evolve --abort` on conflicts (issue5897) |
| 17 * obslog: fix breakage when commit has no description | |
| 18 * amend: use context manager for locks (issue5887) | |
| 19 * evolve: fix detection of interactive shell | |
| 20 | |
| 21 topic (0.9.1) | |
| 22 | |
| 23 * topic: fix documentation formatting | |
| 16 | 24 |
| 17 8.0.0 -- 2018-04-25 | 25 8.0.0 -- 2018-04-25 |
| 18 ------------------- | 26 ------------------- |
| 19 | 27 |
| 20 * evolve: a new `--abort` flag which aborts an interrupted evolve | 28 * evolve: a new `--abort` flag which aborts an interrupted evolve |