Repository navigation
Restore two changes lost to a squash merge - #1166
Merged
Merged
Conversation
Both were pushed to the sync-release-preflight branch after #1165 had already squash-merged, so they never reached main. My mistake: I pushed to a branch whose pull request was closed, and the green checks I then polled were that merged pull request's, which read as confirmation that the new commits had landed. They had not. The 3.15 entry no longer calls a released Python a release candidate. This one matters before 26.3 is cut, because the entry is still in Unreleased here, where it can be fixed. django-icons and django-bootstrap4 both published that sentence; their dated sections stay as they are, since a release section records what was said at the time. MAINTAINING.md gains the note that release-check reporting no Unreleased entries straight after a cut means nothing is pending, not that the changelog was lost. django-icons lost the same MAINTAINING note the same way and gets its own restore. django-bootstrap5 is unaffected, its sync pull request is still open and carries both commits. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
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.
Both of these were pushed to the
sync-release-preflightbranch after #1165 had already squash-merged, so they never reachedmain. Spotted by the django-bootstrap3 session, and the mistake was mine: I pushed to a branch whose pull request was closed, then polled CI and read that merged pull request's green checks as confirmation the new commits had landed. They had not. A green check on a merged PR says nothing about a commit pushed afterwards.The 3.15 wording, and this is the one that matters before 26.3 is cut. The entry calls Python 3.15 a release candidate. 3.15.0 shipped on 2026-10-09, so that is no longer true, and here the entry is still in
Unreleasedwhere it can be fixed. django-icons and django-bootstrap4 both published that sentence already; their dated sections stay as they are, because a release section records what was said at the time rather than what turned out to be true.The MAINTAINING.md note, propagated from zostera/django-marina#696:
release-checkreporting noUnreleasedentries straight after a cut means nothing is pending, not that the changelog was lost. The paragraph is byte-identical to marina's.Blast radius, since the same push pattern hit three repos: django-icons lost the same MAINTAINING note and gets its own restore. django-bootstrap5 is unaffected, because its sync pull request is still open and carries both commits. django-marina and django-bootstrap4 were never affected.
Nothing else from marina is outstanding for this repository after this.
🤖 Generated with Claude Code
Correction: an earlier revision of this description dated Python 3.15.0 to 2026-10-01. That is Python 3.10's end-of-life date. 3.15.0 released on 2026-10-09. Caught by the django-bootstrap5 session; no repository file or commit message carried the wrong date.