diff --git a/RELEASING.md b/RELEASING.md index 66bb7eb9b..dccc42efd 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -47,22 +47,21 @@ Always maintain changelogs in main branch (not in release branches). - format ([#ISSUE](https://github.com/simonmichael/hledger/issues/), AUTHOR) on its own line - commit: `./Shake changelogs -c` -**At some point in the release cycle:** -- add the next release heading, with date "unreleased", above last release heading: - +**After cherry-picking** changes to a release branch: +- move the corresponding changelog items under a pending release heading, + creating that when necessary: ``` # LATESTHASH - ...CHANGES... + ...CHANGES ONLY IN MASTER... - # NEXTVER unreleased <- ADD + # NEXTVER unreleased + + ...CHANGES CHERRYPICKED INTO RELEASE BRANCH... # LASTVER YYYY-MM-DD ``` -**After cherry-picking** changes to a release branch: -- move the corresponding changelog items under the pending release heading. - **At release:** - do final update/edits; check organisation, wording, formatting, issue links