Mercurial > evolve
comparison CHANGELOG @ 3914:96945ea908df stable
branching: merge default into stable
The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch
policy requires this merge. The @ bookmark is in the right location, so people
doing clone will get to the latest release.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 31 Jul 2018 12:52:06 +0200 |
| parents | 9c0b37be8582 |
| children | 3d0fa4a94871 |
comparison
equal
deleted
inserted
replaced
| 3901:f2b8429db565 | 3914:96945ea908df |
|---|---|
| 1 Changelog | 1 Changelog |
| 2 ========= | 2 ========= |
| 3 | |
| 4 8.1.0 - in progress | |
| 5 ------------------- | |
| 6 | |
| 7 * evolve: handle branch changes when solving content divergence, | |
| 8 * evolve: improve multiple aspect of divergence resolution | |
| 9 * branch changes handling, | |
| 10 * parent changes handling, | |
| 11 * divergent stack handling, | |
| 12 * evolve: add a help section dedicated to interrupted evolve, | |
| 13 * evolve: merge commit messages when resolving content divergence (issue5877) | |
| 14 * evolve: show unfinished state information in `hg status -v` (issue5886) | |
| 15 * evolve: move bookmarks also when updating to successors (issue5923) | |
| 16 * evolve: add a new `--no-update` flag to keep working copy on the initial | |
| 17 revision. | |
| 18 * evolve: new help section dedicated to resuming operation interrupted by | |
| 19 merge conflit, `hg help evolve.interrupted`. | |
| 3 | 20 |
| 4 8.0.1 -- 2018-06-11 | 21 8.0.1 -- 2018-06-11 |
| 5 ------------------- | 22 ------------------- |
| 6 | 23 |
| 7 * compatibility with mercurial 4.6.1 | 24 * compatibility with mercurial 4.6.1 |