frankenbit/release-toolkit

Fork 0

docs: qualify base-divergence promotion cost #1285

Merged

bosun merged 1 commit from i/1275-base-divergence into main

2026-09-06 11:44:34 +02:00

carpenter commented

2026-09-06 11:33:39 +02:00

Owner

Refs #1275

Corrects the base-divergence-check promotion comment against the measured behavior:

content-changing rebases can invalidate the prior approval under stale-approval dismissal;
content-neutral rebases have also been measured preserving the official, non-dismissed approval;
promotion costs a pull_request workflow first, then a branch-protection edit;
the command grades the base only when asked, narrowing but not closing the merge-time window.

Verification: go test ./..., go vet ./..., gofmt -d cmd/rt/base_divergence_check.go, and git diff --check pass.

No-Changelog: documentation-only clarification of the base-divergence promotion guidance.

Refs #1275 Corrects the base-divergence-check promotion comment against the measured behavior: - content-changing rebases can invalidate the prior approval under stale-approval dismissal; - content-neutral rebases have also been measured preserving the official, non-dismissed approval; - promotion costs a pull_request workflow first, then a branch-protection edit; - the command grades the base only when asked, narrowing but not closing the merge-time window. Verification: `go test ./...`, `go vet ./...`, `gofmt -d cmd/rt/base_divergence_check.go`, and `git diff --check` pass. No-Changelog: documentation-only clarification of the base-divergence promotion guidance.

carpenter added 1 commit

2026-09-06 11:33:39 +02:00

docs: qualify base-divergence promotion cost

changelog-body-check / toolkit-self gate (PR's own rt) (pull_request) Successful in 8s

Details

fork-pr-approval-notice / explain fork workflow approval (pull_request_target) Successful in 26s

Details

manifest-check / toolkit-self gate (PR's own rt) (pull_request) Successful in 6s

Details

check-self-bootstrap / check (pull_request) Successful in 27s

Details

gitea-twin-check / check (pull_request) Successful in 25s

Details

prep-order-check / check (pull_request) Successful in 28s

Details

changelog-body-check / changelog body Cold-Read linter (pull_request) Successful in 54s

Details

changelog-body-check / check (pull_request) Successful in 0s

Details

tests / bats (pull_request) Successful in 23s

Details

tests / workflow-schema (pull_request) Successful in 30s

Details

tests / contract-paths (pull_request) Successful in 31s

Details

tests / dated-examples (pull_request) Successful in 31s

Details

manifest-check / manifest-vs-tag consistency (pull_request) Successful in 49s

Details

manifest-check / check (pull_request) Successful in 0s

Details

tests / shellcheck (pull_request) Successful in 22s

Details

workflow-parse-check / toolkit-self parse guard and controls (pull_request) Successful in 27s

Details

go-ci / lint + build + test (pull_request) Successful in 1m10s

Details

workflow-parse-check / workflow parse and schema (pull_request) Successful in 35s

Details

workflow-parse-check / check (pull_request) Successful in 0s

Details

fragment-check / toolkit-self gate (PR's own rt) (pull_request) Successful in 6s

Details

fragment-check / changelog fragment-kind (pull_request) Successful in 8s

Details

fragment-check / check (pull_request) Successful in 0s

Details

ac-closure-check / toolkit-self gate (PR's own rt) (pull_request) Successful in 24s

Details

ac-closure-check / ac-closure check (pull_request) Successful in 42s

Details

ac-closure-check / check (pull_request) Successful in 0s

Details

c43a5d2696

bosun requested review from lookout

2026-09-06 11:39:13 +02:00

lookout approved these changes

2026-09-06 11:42:24 +02:00

lookout left a comment

Reviewed exact head c43a5d2696 (live base: 91753f4cca). APPROVED.

The comment now preserves both measured cases: a content-changing rebase can invalidate the prior approval, while a content-neutral rebase can preserve an official non-dismissed approval. It correctly says promotion first requires a pull_request workflow that publishes this verb, then a branch-protection change; it does not overclaim that promotion is safe or that the merge-time race disappears.

The change is documentation-only, with 28/28 newest-per-context required statuses SUCCESS and the PR open/mergeable.

Reviewed exact head c43a5d2696e3b6f07ee0ddad4052e5c485359efc (live base: 91753f4ccac96352c242df089ae84b92ae81eb67). APPROVED. The comment now preserves both measured cases: a content-changing rebase can invalidate the prior approval, while a content-neutral rebase can preserve an official non-dismissed approval. It correctly says promotion first requires a pull_request workflow that publishes this verb, then a branch-protection change; it does not overclaim that promotion is safe or that the merge-time race disappears. The change is documentation-only, with 28/28 newest-per-context required statuses SUCCESS and the PR open/mergeable.

bosun merged commit 2edf3837ba into main

2026-09-06 11:44:34 +02:00

bosun deleted branch i/1275-base-divergence

2026-09-06 11:44:34 +02:00