docs: clarify main-line branch strategy after ADR-0009 #1004
No reviewers
Labels
No labels
bump
major
bump
minor
bump
patch
kind/bug
kind/chore
kind/docs
kind/feature
priority/critical
priority/high
priority/low
priority/medium
size/L
size/M
size/S
size/XL
No milestone
No project
No assignees
2 participants
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
frankenbit/release-toolkit!1004
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "i/604-branch-strategy"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Refs frankenbit/release-toolkit#604.
Chosen disposition: option 1. The 2026-07-07 branch/version proposal remains as a dated historical decision record, while a new normative section records the current ADR-0009 strategy.
The current guidance now states that
mainis the only active release line,v2/nextis not a live or public release target, and the plannedv1.0.0-alpha.N→beta.N→rc.N→v1.0.0sequence is deferred to ADR-0009 Phase 8. The bootstrapscripts/fetch-rt.shresidual and its delivery-mechanism retirement condition are also stated.Live contract and Arc42 references that pointed into the superseded branch-strategy sections now point to ADR-0009 or identify the historical material explicitly. No adopter-facing document outside the preserved historical architecture records points to
v2/nextas a current strategy.Verification from base
1bce291339c6163709a53b755febf9bbea0f9397:git diff --check: passgo run ./cmd/rt fragment-check changelog.d: passgo build ./...,go vet ./...,go test ./...: passbats tests: 117/117 passREQUEST_CHANGES — exact head
8344dc92dc.Finding (docs/architecture/branch-strategy.md:23-25): the new current-guidance bullet says ADR-0009 retained
v2/nextas “the implementation branch used at ratification.” That is not the source-grounded history this PR is meant to establish. ADR-0009’s header (§ Branch) says it was the execution home named at ratification, and §2.4 says the port landed onmain; issue #604 likewise records that nov2/nextbranch was used for the port. The repository has nov2/nextref. “Used” therefore implies that the implementation ran on that branch and conflicts with the stated history. Please replace this with the precise “execution home named at ratification; the live substrate/port lands on main” wording (or equivalent) so the new normative section does not reintroduce the false branch history it is correcting.Verification at this head:
git diff --checkpass;go run ./cmd/rt fragment-check changelog.dpass;go build ./...,go vet ./...,go test ./...pass;bats tests117/117; 46 changed-document relative links checked with 0 broken; all 3 changed JSON schemas parse. The rest of the ADR/reference rework is internally consistent, but I cannot approve while this central historical statement is inaccurate.APPROVE — exact head
d88dc886aa.The branch-strategy correction resolves review 6011. Current guidance now accurately says ADR-0009 records v2/next as the execution home named at ratification, not a live implementation branch used for this port; the port lands on main and no v2/next ref is part of the current strategy. The historical sections are explicitly marked as superseded. This matches ADR-0009’s header and §2.4 and issue #604’s measured history; no v2/next ref exists.
Re-read and verification at this exact head: the old-to-new correction is limited to docs/architecture/branch-strategy.md (7 lines); git diff --check passes; go test ./..., go vet ./..., go build ./..., and bats tests (117/117) pass; all three changed JSON schemas parse; Forgejo reports 25/25 successful statuses and the head is unchanged.
APPROVE — exact head
d88dc886aa.The branch-strategy correction resolves review 6011. Current guidance now accurately says ADR-0009 records v2/next as the execution home named at ratification, not a live implementation branch used for this port; the port lands on main and no v2/next ref is part of the current strategy. The historical sections are explicitly marked as superseded. This matches ADR-0009’s header and §2.4 and issue #604’s measured history; no v2/next ref exists.
Re-read and verification at this exact head: the old-to-new correction is limited to docs/architecture/branch-strategy.md (7 lines); git diff --check passes; go test ./..., go vet ./..., go build ./..., and bats tests (117/117) pass; all three changed JSON schemas parse; Forgejo reports 25/25 successful statuses and the head is unchanged.