Mercurial > evolve
comparison CHANGELOG @ 5987:e97fbded40a5
branching: merge stable into default
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 06 Aug 2021 00:04:46 +0200 |
| parents | 8a7ad6ba2654 991be5efe7cb |
| children | d28c9f359464 |
comparison
equal
deleted
inserted
replaced
| 5973:8a7ad6ba2654 | 5987:e97fbded40a5 |
|---|---|
| 9 content-divergence (most recent evolution will be used). | 9 content-divergence (most recent evolution will be used). |
| 10 * evolve: drop the deprecated --unstable, --divergent and --bumped flags, | 10 * evolve: drop the deprecated --unstable, --divergent and --bumped flags, |
| 11 they were replaced by --orphan, --content-divergent and --phase-divergent | 11 they were replaced by --orphan, --content-divergent and --phase-divergent |
| 12 respectively a long time ago | 12 respectively a long time ago |
| 13 | 13 |
| 14 10.3.3 - in progress | |
| 15 -------------------- | |
| 16 | |
| 17 topic (0.22.3) | |
| 18 | |
| 19 * topic: correctly update from public commits with a (now hidden) topic | |
| 20 when hg update is called without any revision (issue6553) | |
| 21 | |
| 22 | |
| 14 10.3.2 -- 2021-05-28 | 23 10.3.2 -- 2021-05-28 |
| 15 -------------------- | 24 -------------------- |
| 16 | 25 |
| 17 * next: remove duplicated targets when updating from an unstable changeset | 26 * next: remove duplicated targets when updating from an unstable changeset |
| 18 * evolve: use "served" repo filter to guess what the server will publish | 27 * evolve: use "served" repo filter to guess what the server will publish |
| 28 * touch/fold/metaedit/rewind: no longer lose changes from merge commits | |
| 29 (issue6416). As a consequence (for technical reasons), when run with | |
| 30 Mercurial 5.5 and earlier, these commands now require there to be no | |
| 31 unresolved conflicts. | |
| 32 | |
| 19 | 33 |
| 20 topic (0.22.2) | 34 topic (0.22.2) |
| 21 | 35 |
| 22 * topic: don't lose any file changes when changing topic of a merge commit | 36 * topic: don't lose any file changes when changing topic of a merge commit |
| 23 * topic: announce ext-topics-publish capability in case of SSH and HTTP too | 37 * topic: announce ext-topics-publish capability in case of SSH and HTTP too |