Mercurial > evolve
comparison CHANGELOG @ 3938:2c5d79c6459c stable 8.1.0
packaging: prepare version
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 03 Aug 2018 05:41:08 +0200 |
| parents | 3d0fa4a94871 |
| children | 6aa526b477af |
comparison
equal
deleted
inserted
replaced
| 3932:35b2d201eb71 | 3938:2c5d79c6459c |
|---|---|
| 2 ========= | 2 ========= |
| 3 | 3 |
| 4 8.1.0 - in progress | 4 8.1.0 - in progress |
| 5 ------------------- | 5 ------------------- |
| 6 | 6 |
| 7 * compatibility with mercurial 4.7rc0 | 7 * compatibility with mercurial 4.7 |
| 8 * evolve: handle branch changes when solving content divergence, | 8 * evolve: improve multiple aspect of content-divergence resolution |
| 9 * evolve: improve multiple aspect of divergence resolution | |
| 10 * branch changes handling, | 9 * branch changes handling, |
| 11 * parent changes handling, | 10 * parent changes handling, |
| 11 * description changes handling, | |
| 12 * divergent stack handling, | 12 * divergent stack handling, |
| 13 * evolve: merge commit messages when resolving content divergence (issue5877) | 13 * improved resume, stop and abort of divergent resolution |
| 14 * evolve: improved automatic resolution of phase-divergence | |
| 15 | |
| 16 * evolve: add a --update and --no-update flag to evolve to control final | |
| 17 working copy parent | |
| 18 * evolve: show `hg help evolve.interrupted-evolve` in error when conflicts | |
| 14 * evolve: show unfinished state information in `hg status -v` (issue5886) | 19 * evolve: show unfinished state information in `hg status -v` (issue5886) |
| 15 * evolve: move bookmarks also when updating to successors (issue5923) | 20 * evolve: move bookmarks also when updating to successors (issue5923) |
| 21 * evolve: improve orphan resolution when combined with divergence (issue5946) | |
| 16 * amend: abort `--patch` by saving an empty file (issue5925) | 22 * amend: abort `--patch` by saving an empty file (issue5925) |
| 23 * | |
| 17 * evolve: add a new `--no-update` flag to keep working copy on the initial | 24 * evolve: add a new `--no-update` flag to keep working copy on the initial |
| 18 revision. | 25 revision. |
| 19 * evolve: new help section dedicated to resuming operation interrupted by | 26 * evolve: new help section dedicated to resuming operation interrupted by |
| 20 merge conflit, `hg help evolve.interrupted`. | 27 merge conflit, `hg help evolve.interrupted`. |
| 28 * obslog: --filternonlocal | |
| 29 | |
| 30 * rewind: first limited version of `rewind` command to restore stack of commit to a | |
| 31 precusors state (check command help for detail and limitation) | |
| 32 | |
| 33 topic (0.10.0) | |
| 34 | |
| 35 * display a hint when a topic becomes empty | |
| 21 | 36 |
| 22 8.0.1 -- 2018-06-11 | 37 8.0.1 -- 2018-06-11 |
| 23 ------------------- | 38 ------------------- |
| 24 | 39 |
| 25 * compatibility with mercurial 4.6.1 | 40 * compatibility with mercurial 4.6.1 |