fix(adr): a record freezes at the merge that lands it - #586
Merged
Merged
Conversation
…'s first accepted commit The frozen check walked every parent of the default branch, so a record accepted on a review branch and revised there froze at the pre-review commit. Main has carried two false errors on ADR-179 and ADR-186 since #581 and #583 merged. The walk is now --first-parent (with -m for older git). make test-adr lints the repo's own records, so this class of break fails CI.
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.
Summary
make test-adralso lints the repo's own records, so a red corpus fails CI.v1-frozen-merged-branchfails without the fix and passes with it;-editedconfirms that editing after the merge still errors. Not confident: CI's shallow checkout, where the history walk sees only HEAD. The check then can't fire there, so it produces no false errors, but it also catches nothing in CI.Why
Since #581 and #583 merged,
adr linton main reports 4 errors:basis,targetsandverbon ADR-179 and ADR-186 "changed after the decision left proposed". The changes were review fixes made on the PR branches before merge. Nothing in CI linted the repo's records, so main went red without a failing check. I found it while drafting ADR-306.make test-adr: golden 105, macro 31, all passing. Repo lint: 0 errors, 0 warnings.