Skip to content

chore: back-merge v0.13.2 release into develop - #441

Merged
Zious11 merged 2 commits into
developfrom
main
Jul 25, 2026
Merged

chore: back-merge v0.13.2 release into develop#441
Zious11 merged 2 commits into
developfrom
main

Conversation

@Zious11

@Zious11 Zious11 commented Jul 25, 2026

Copy link
Copy Markdown
Owner

Back-merge: v0.13.2 → develop

This PR merges the v0.13.2 release branch (main) back into develop to keep the
two branches in sync after the release.

CRITICAL — Must be merged as a TRUE MERGE COMMIT

Do NOT use squash merge or rebase. This PR must be merged with Create a merge commit
so that main becomes a proper ancestor of develop.

Merging as squash or rebase breaks the git ancestry chain (DRIFT-BACKMERGE-SQUASH-001),
preventing git merge-base --is-ancestor from confirming that release commits are
contained in develop.

Merge method: "Create a merge commit" only.

Precedent

D-491 (v0.13.1) back-merge: PR #433 — same pattern, same constraint.

Commits merged from main

@Zious11
Zious11 merged commit e8841d7 into develop Jul 25, 2026
31 checks passed
Zious11 added a commit that referenced this pull request Jul 25, 2026
Release PR #440 9601d71 merged to main
(human-merged). Tag v0.13.2 (lightweight). GH release 4 assets published
2026-07-25T00:36:46Z. Back-merge PR #441 TRUE-MERGE e8841d7 to develop
(human-authorized gh pr merge --merge; ancestry PASS, no DRIFT-BACKMERGE-
SQUASH recurrence). Ships wave-85: IEC-104 timed-command detection
(TypeIDs 58-64) + SEC-001 ENIP unsafe elimination + gate-fix. Version
0.13.1→0.13.2. CR-004 CHANGELOG trim applied at release cut.

STATE.md: release fields updated (released_version v0.13.2, released_at
2026-07-25, release_tag v0.13.2, release_commit 9601d71..., develop_head
e8841d7..., cargo_version 0.13.2); EXACT RESUME POINT D-512; Phase
Progress v0.13.2 RELEASED row added; Concurrent Cycles wave-085 develop
head updated; CPS D-507 rolled off / D-512 on; D-512 Decisions Log entry;
Session Resume Checkpoint D-512 replaces D-511; SIZE BUDGET banner
corrected to ~315 lines (wc-l).

cycles/wave-085/session-checkpoints.md: D-511 checkpoint archived.
cycles/wave-085/burst-log.md: D-507 CPS archival + D-512 burst entry.

Count-propagation sweep: no numeric BC/VP/story counts changed in this
burst. Version string sweep: all v0.13.1 and 0ab6f52 hits are legitimate
historical audit-trail entries (prior_released_version, frozen gate SHA,
release row). No propagation gaps.
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.

1 participant