Mercurial > evolve
comparison CHANGELOG @ 5815:44dd0e2a28bf
changelog: move a recently added feature to the correct release
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 04 Mar 2021 09:12:41 +0800 |
| parents | 307a9e8489f2 |
| children | 82040a455e71 |
comparison
equal
deleted
inserted
replaced
| 5814:307a9e8489f2 | 5815:44dd0e2a28bf |
|---|---|
| 5 -------------------- | 5 -------------------- |
| 6 | 6 |
| 7 * evolve: add a experimental.evolution.in-memory config for running evolve | 7 * evolve: add a experimental.evolution.in-memory config for running evolve |
| 8 in memory | 8 in memory |
| 9 * evolve: improve content-divergence resolution that involves parent changes | 9 * evolve: improve content-divergence resolution that involves parent changes |
| 10 * evolve: preserve wdir parent when using `hg evolve --stop` | |
| 10 * obslog: clarify the command name in the help, | 11 * obslog: clarify the command name in the help, |
| 11 * pdiff, pstatus: drop some irrelevant command flags inherited from `hg diff` | 12 * pdiff, pstatus: drop some irrelevant command flags inherited from `hg diff` |
| 12 and `hg status` respectively | 13 and `hg status` respectively |
| 13 * rewind: detect and abort on cases when we rewind to changesets that are | 14 * rewind: detect and abort on cases when we rewind to changesets that are |
| 14 precessors / successors of each other | 15 precessors / successors of each other |
| 64 * evolve: specify the source of config override for `server.bundle1=no` | 65 * evolve: specify the source of config override for `server.bundle1=no` |
| 65 * evolve: avoid leaving mergestate after instability resolution | 66 * evolve: avoid leaving mergestate after instability resolution |
| 66 * evolve: while resolving conflicts, the evolved node will no longer be a | 67 * evolve: while resolving conflicts, the evolved node will no longer be a |
| 67 dirstate parent (won't show up in `hg parents` and not as `@` in `hg log -G`, | 68 dirstate parent (won't show up in `hg parents` and not as `@` in `hg log -G`, |
| 68 but it will show up as `%` with hg >= 5.4) | 69 but it will show up as `%` with hg >= 5.4) |
| 69 * evolve: preserve wdir parent when using `hg evolve --stop` | |
| 70 | 70 |
| 71 * metaedit: update bookmark location when applicable | 71 * metaedit: update bookmark location when applicable |
| 72 | 72 |
| 73 * rewind: add a --dry-run flag | 73 * rewind: add a --dry-run flag |
| 74 * rewind: properly record rewind of splits as folds | 74 * rewind: properly record rewind of splits as folds |