Mercurial > evolve
comparison CHANGELOG @ 3919:e2321901592d mercurial-4.6
test-compat: merge stable into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 31 Jul 2018 12:54:46 +0200 |
| parents | 3d0fa4a94871 |
| children | 2c5d79c6459c |
comparison
equal
deleted
inserted
replaced
| 3913:9bc01ec6fc54 | 3919:e2321901592d |
|---|---|
| 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 * evolve: handle branch changes when solving content divergence, | 8 * evolve: handle branch changes when solving content divergence, |
| 8 * evolve: improve multiple aspect of divergence resolution | 9 * evolve: improve multiple aspect of divergence resolution |
| 9 * branch changes handling, | 10 * branch changes handling, |
| 10 * parent changes handling, | 11 * parent changes handling, |
| 11 * divergent stack handling, | 12 * divergent stack handling, |
| 12 * evolve: add a help section dedicated to interrupted evolve, | |
| 13 * evolve: merge commit messages when resolving content divergence (issue5877) | 13 * evolve: merge commit messages when resolving content divergence (issue5877) |
| 14 * evolve: show unfinished state information in `hg status -v` (issue5886) | 14 * evolve: show unfinished state information in `hg status -v` (issue5886) |
| 15 * evolve: move bookmarks also when updating to successors (issue5923) | 15 * evolve: move bookmarks also when updating to successors (issue5923) |
| 16 * amend: abort `--patch` by saving an empty file (issue5925) | |
| 16 * evolve: add a new `--no-update` flag to keep working copy on the initial | 17 * evolve: add a new `--no-update` flag to keep working copy on the initial |
| 17 revision. | 18 revision. |
| 18 * evolve: new help section dedicated to resuming operation interrupted by | 19 * evolve: new help section dedicated to resuming operation interrupted by |
| 19 merge conflit, `hg help evolve.interrupted`. | 20 merge conflit, `hg help evolve.interrupted`. |
| 20 | 21 |