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