chore: restore 8.7.0-bound work into [Unreleased] after 8.6.2 ships#451
Merged
Conversation
…6.2 ships Companion to chore/cut-862 (PR #450). After v8.6.2 ships via `make release`, this commit moves the parked content out of `## [Pending 8.7.0]` and back into the canonical `## [Unreleased]` header, then deletes the temporary `[Pending 8.7.0]` section. This branch is based on chore/cut-862, NOT on post-release master. It needs a rebase onto master AFTER `make release 8.6.2` lands the release commit: git checkout chore/restore-870 git fetch origin git rebase origin/master The rebase has one expected hunk conflict in CHANGELOG.md: the narrow Fixed entries (VM-1398, VM-1364, VM-1138, Opus, Kokoro fork) that this commit deletes from [Unreleased] will already have been moved to [8.6.2] by release.py's header-rewrite. Resolve by accepting the post-release state (those entries belong in [8.6.2] and should not be in [Unreleased]). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
0b3b322 to
d1ec54c
Compare
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
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.
Draft. Companion to #450 (
chore/cut-862). Do not merge until afterv8.6.2ships.After
make release 8.6.2runs, this commit moves the parked content out of## [Pending 8.7.0]and back into the canonical## [Unreleased]header, then deletes the temporary[Pending 8.7.0]section.Branch base & required rebase
This branch is based on
chore/cut-862(pre-release state). It needs a rebase onto post-release master oncemake release 8.6.2has pushed the release commit:Expected conflict (one hunk, in
CHANGELOG.md): the five narrow### Fixedentries this commit deletes from[Unreleased]will already have been moved into[8.6.2]byrelease.py's header rewrite. Resolve by accepting the post-release state — those entries belong in[8.6.2]and should not be in[Unreleased].After resolving,
git rebase --continue, force-push the branch, mark the PR ready for review, merge.What the diff does
### Fixedentries that lived in[Unreleased]for the 8.6.2 cut (post-rebase: this hunk is the no-op described above).## [Pending 8.7.0]header line.Net effect on post-release master: the content currently under
[Pending 8.7.0]becomes the body of[Unreleased], ready to accumulate further 8.7.0 work.Verification post-rebase
After
git rebase origin/masterand resolving the one conflict:awk '/^## \[/{print}' CHANGELOG.mdlists[Unreleased]→[8.6.2] - 2026-05-28→[8.6.1] - 2026-04-21→ … (no[Pending 8.7.0])[Unreleased]contains the Added/Migration/Fixed/Changed/Deprecated/Removed sections from the original pre-cut state.[8.6.2]contains only the five narrow Fixed entries.Sequence
make release 8.6.2→ tag pushes → Actions ship the release.