Mercurial > evolve
comparison CHANGELOG @ 6021:bcdccdd48d99 stable
changelog: move note about touch+merge (issue6416) to 10.3.3
It belongs there. I assume this note was at some point merged into 10.3.2 by
mistake during a rebase because the MR is quite old.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 25 Aug 2021 17:38:27 +0300 |
| parents | c8a75487cb1c |
| children | 6c67219ce779 |
comparison
equal
deleted
inserted
replaced
| 6020:c8a75487cb1c | 6021:bcdccdd48d99 |
|---|---|
| 8 -------------------- | 8 -------------------- |
| 9 | 9 |
| 10 * evolve: compatibility with Mercurial 5.9 | 10 * evolve: compatibility with Mercurial 5.9 |
| 11 * fold: make sure to save commit messages in last-message.txt, also affects | 11 * fold: make sure to save commit messages in last-message.txt, also affects |
| 12 metaedit (issue6549) | 12 metaedit (issue6549) |
| 13 * touch: fix `hg touch` on merge commits | |
| 14 | |
| 15 topic (0.22.3) | |
| 16 | |
| 17 * topic: correctly update from public commits with a (now hidden) topic | |
| 18 when hg update is called without any revision (issue6553) | |
| 19 * topic: fix the help text to show how to disable publishing | |
| 20 | |
| 21 10.3.2 - 2021-05-28 | |
| 22 -------------------- | |
| 23 | |
| 24 * next: remove duplicated targets when updating from an unstable changeset | |
| 25 * evolve: use "served" repo filter to guess what the server will publish | |
| 26 * touch/fold/metaedit/rewind: no longer lose changes from merge commits | 13 * touch/fold/metaedit/rewind: no longer lose changes from merge commits |
| 27 (issue6416). As a consequence (for technical reasons), when run with | 14 (issue6416). As a consequence (for technical reasons), when run with |
| 28 Mercurial 5.5 and earlier, these commands now require there to be no | 15 Mercurial 5.5 and earlier, these commands now require there to be no |
| 29 unresolved conflicts. | 16 unresolved conflicts. |
| 30 | 17 |
| 18 topic (0.22.3) | |
| 19 | |
| 20 * topic: correctly update from public commits with a (now hidden) topic | |
| 21 when hg update is called without any revision (issue6553) | |
| 22 * topic: fix the help text to show how to disable publishing | |
| 23 | |
| 24 10.3.2 - 2021-05-28 | |
| 25 -------------------- | |
| 26 | |
| 27 * next: remove duplicated targets when updating from an unstable changeset | |
| 28 * evolve: use "served" repo filter to guess what the server will publish | |
| 31 | 29 |
| 32 topic (0.22.2) | 30 topic (0.22.2) |
| 33 | 31 |
| 34 * topic: don't lose any file changes when changing topic of a merge commit | 32 * topic: don't lose any file changes when changing topic of a merge commit |
| 35 * topic: announce ext-topics-publish capability in case of SSH and HTTP too | 33 * topic: announce ext-topics-publish capability in case of SSH and HTTP too |