Mercurial > evolve
comparison CHANGELOG @ 5621:87ee065a688b
changelog: update for 10.1.0
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 31 Oct 2020 02:34:31 +0800 |
| parents | 3946ee4ee3ae |
| children | fe31179e1941 |
comparison
equal
deleted
inserted
replaced
| 5620:eb326644dc29 | 5621:87ee065a688b |
|---|---|
| 2 ========= | 2 ========= |
| 3 | 3 |
| 4 10.1.0 - in progress | 4 10.1.0 - in progress |
| 5 -------------------- | 5 -------------------- |
| 6 | 6 |
| 7 * numerous minor changes to packaging, README moved to README.rst | 7 * compatibility with Mercurial 5.6 |
| 8 | |
| 9 * numerous minor changes to packaging, Makefile, README moved to README.rst | |
| 8 * metaedit: update bookmark location when applicable | 10 * metaedit: update bookmark location when applicable |
| 11 * evolve: various improvements to content-divergence resolution | |
| 9 * evolve: fix various issues with --continue when solving content-divergence | 12 * evolve: fix various issues with --continue when solving content-divergence |
| 10 * rewind: add a --dry-run flag | 13 * rewind: add a --dry-run flag |
| 11 * rewind: properly record rewind of splits as folds | 14 * rewind: properly record rewind of splits as folds |
| 12 * evolve: while resolving conflicts, the evolved node will no longer be a | 15 * evolve: while resolving conflicts, the evolved node will no longer be a |
| 13 dirstate parent (won't show up in `hg parents` and not as `@` in `hg log -G`, | 16 dirstate parent (won't show up in `hg parents` and not as `@` in `hg log -G`, |
| 15 | 18 |
| 16 topic (0.20.0) | 19 topic (0.20.0) |
| 17 | 20 |
| 18 * stack: support foo#stack relation revset (hg-5.4+ only) | 21 * stack: support foo#stack relation revset (hg-5.4+ only) |
| 19 * merge: add a experimental.topic.linear-merge option to allow oedipus merges | 22 * merge: add a experimental.topic.linear-merge option to allow oedipus merges |
| 20 in some cases. | 23 in some cases |
| 21 | 24 |
| 22 10.0.3 - in progress | 25 10.0.3 - in progress |
| 23 -------------------- | 26 -------------------- |
| 24 | 27 |
| 25 * evolve: specific the source of config override for `server.bundle1=no` | 28 * evolve: specific the source of config override for `server.bundle1=no` |