Mercurial > evolve
changeset 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 | 43bde39bbe65 439f0144f143 |
| files | CHANGELOG |
| diffstat | 1 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Tue Aug 24 03:43:46 2021 +0200 +++ b/CHANGELOG Wed Aug 25 17:38:27 2021 +0300 @@ -10,7 +10,10 @@ * evolve: compatibility with Mercurial 5.9 * fold: make sure to save commit messages in last-message.txt, also affects metaedit (issue6549) - * touch: fix `hg touch` on merge commits + * touch/fold/metaedit/rewind: no longer lose changes from merge commits + (issue6416). As a consequence (for technical reasons), when run with + Mercurial 5.5 and earlier, these commands now require there to be no + unresolved conflicts. topic (0.22.3) @@ -23,11 +26,6 @@ * next: remove duplicated targets when updating from an unstable changeset * evolve: use "served" repo filter to guess what the server will publish - * touch/fold/metaedit/rewind: no longer lose changes from merge commits - (issue6416). As a consequence (for technical reasons), when run with - Mercurial 5.5 and earlier, these commands now require there to be no - unresolved conflicts. - topic (0.22.2)