release: fold the 0.94.0 notes back onto master - #530
Merged
Conversation
The 0.94.0 cut assembled its 16 fragments into CHANGELOG.md on `release/0.94.0`; master still carried them. Same foldback 7cdcf99 did for 0.93.0/0.93.1. Deletes EXACTLY the 16 fragments that release consumed, computed from the release commit's own file list rather than by wildcard — master has gained three since the branch point (pgw#973, pgw#1000, pgw#1006) and those belong to the NEXT cut, not this one. Verified master's CHANGELOG.md was untouched between the branch point and now, so taking the release branch's copy drops nothing. Incidentally removes changelog.d/pgw984-pgw985.md, whose name violated the documented `<prefix><number>.md` convention and made assemble_changelog.py refuse the whole 0.94.0 cut until it was renamed. Master no longer carries it, so the next cutter does not hit the same wall.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The 0.94.0 cut assembled its 16 fragments into
CHANGELOG.mdonrelease/0.94.0; master still carried them. Same foldback7cdcf99ddid for 0.93.0/0.93.1.Deletes exactly the 16 fragments that release consumed, computed from the release commit's own file list rather than by wildcard — master has gained three since the branch point (
pgw973,pgw1000,pgw1006) and those belong to the next cut. Verified master'sCHANGELOG.mdwas untouched between the branch point and now, so taking the release branch's copy drops nothing.Incidentally removes
changelog.d/pgw984-pgw985.md, whose name violated the documented<prefix><number>.mdconvention and madeassemble_changelog.pyrefuse the whole 0.94.0 cut until it was renamed topgw984.md. Master no longer carries it, so the next cutter does not hit the same wall.Context: 0.94.0 is published (simple index:
gen_worker-0.94.0) and carries th#1597's wire-protocol v1 cut.