Skip to content

chore: restore 8.7.0-bound work into [Unreleased] after 8.6.2 ships#451

Merged
mbailey merged 1 commit into
masterfrom
chore/restore-870
May 28, 2026
Merged

chore: restore 8.7.0-bound work into [Unreleased] after 8.6.2 ships#451
mbailey merged 1 commit into
masterfrom
chore/restore-870

Conversation

@ai-cora
Copy link
Copy Markdown
Collaborator

@ai-cora ai-cora commented May 27, 2026

Draft. Companion to #450 (chore/cut-862). Do not merge until after v8.6.2 ships.

After make release 8.6.2 runs, 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 once make release 8.6.2 has pushed the release commit:

git checkout chore/restore-870
git fetch origin
git rebase origin/master

Expected conflict (one hunk, in CHANGELOG.md): the five narrow ### Fixed entries this commit deletes from [Unreleased] will already have been moved into [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].

After resolving, git rebase --continue, force-push the branch, mark the PR ready for review, merge.

What the diff does

  • Removes the five narrow ### Fixed entries that lived in [Unreleased] for the 8.6.2 cut (post-rebase: this hunk is the no-op described above).
  • Removes the ## [Pending 8.7.0] header line.
  • Removes the HTML comment block explaining the temporary layout.

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/master and resolving the one conflict:

  • awk '/^## \[/{print}' CHANGELOG.md lists [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

  1. Merge chore: park 8.7.0-bound work for narrow 8.6.2 patch release #450 → master.
  2. make release 8.6.2 → tag pushes → Actions ship the release.
  3. Watch https://github.com/mbailey/voicemode/actions.
  4. Rebase this branch per the instructions above.
  5. Mark ready for review, merge.

…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>
@ai-cora ai-cora marked this pull request as ready for review May 27, 2026 17:26
@ai-cora ai-cora force-pushed the chore/restore-870 branch from 0b3b322 to d1ec54c Compare May 27, 2026 17:26
@mbailey mbailey merged commit 5e5ed85 into master May 28, 2026
9 checks passed
@mbailey mbailey deleted the chore/restore-870 branch May 28, 2026 01:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants