Mercurial > evolve
comparison CHANGELOG @ 4002:21eab0a99841 mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 21 Aug 2018 14:09:33 +0200 |
| parents | ab2e1da783a4 |
| children | e7abf863e113 |
comparison
equal
deleted
inserted
replaced
| 3936:537fd9a86c06 | 4002:21eab0a99841 |
|---|---|
| 1 Changelog | 1 Changelog |
| 2 ========= | 2 ========= |
| 3 | 3 |
| 4 8.1.0 - in progress | 4 8.1.1 - in progress |
| 5 ------------------- | 5 ------------------- |
| 6 | 6 |
| 7 * compatibility with mercurial 4.7rc0 | 7 * clone: fix possible crash when using clone bundle and forcing cache warming |
| 8 * evolve: handle branch changes when solving content divergence, | 8 * evolve: properly set second parent during conflict (issue5927) |
| 9 * evolve: improve multiple aspect of divergence resolution | 9 * next: delete the evolvestate after aborting interrupted `next --evolve` |
| 10 * next: fix topic restriction when passing --evolve | |
| 11 * obshashrange: fix speed and consistency issues during cache invalidation | |
| 12 * obshashrange: properly persist all caches involved in obshashrange discovery | |
| 13 * prune: improve documentation | |
| 14 | |
| 15 8.1.0 -- 2018-08-03 | |
| 16 ------------------- | |
| 17 | |
| 18 * compatibility with mercurial 4.7 | |
| 19 * evolve: improve multiple aspect of content-divergence resolution | |
| 10 * branch changes handling, | 20 * branch changes handling, |
| 11 * parent changes handling, | 21 * parent changes handling, |
| 22 * description changes handling, | |
| 12 * divergent stack handling, | 23 * divergent stack handling, |
| 13 * evolve: merge commit messages when resolving content divergence (issue5877) | 24 * improved resume, stop and abort of divergent resolution |
| 25 * evolve: improved automatic resolution of phase-divergence | |
| 26 | |
| 27 * evolve: add a --update and --no-update flag to evolve to control final | |
| 28 working copy parent | |
| 29 * evolve: show `hg help evolve.interrupted-evolve` in error when conflicts | |
| 14 * evolve: show unfinished state information in `hg status -v` (issue5886) | 30 * evolve: show unfinished state information in `hg status -v` (issue5886) |
| 15 * evolve: move bookmarks also when updating to successors (issue5923) | 31 * evolve: move bookmarks also when updating to successors (issue5923) |
| 32 * evolve: improve orphan resolution when combined with divergence (issue5946) | |
| 16 * amend: abort `--patch` by saving an empty file (issue5925) | 33 * amend: abort `--patch` by saving an empty file (issue5925) |
| 34 * | |
| 17 * evolve: add a new `--no-update` flag to keep working copy on the initial | 35 * evolve: add a new `--no-update` flag to keep working copy on the initial |
| 18 revision. | 36 revision. |
| 19 * evolve: new help section dedicated to resuming operation interrupted by | 37 * evolve: new help section dedicated to resuming operation interrupted by |
| 20 merge conflit, `hg help evolve.interrupted`. | 38 merge conflit, `hg help evolve.interrupted`. |
| 39 * obslog: --filternonlocal | |
| 40 | |
| 41 * rewind: first limited version of `rewind` command to restore stack of commit to a | |
| 42 precusors state (check command help for detail and limitation) | |
| 43 | |
| 44 topic (0.10.0) | |
| 45 | |
| 46 * display a hint when a topic becomes empty | |
| 21 | 47 |
| 22 8.0.1 -- 2018-06-11 | 48 8.0.1 -- 2018-06-11 |
| 23 ------------------- | 49 ------------------- |
| 24 | 50 |
| 25 * compatibility with mercurial 4.6.1 | 51 * compatibility with mercurial 4.6.1 |