Repository navigation
tweaks/shelf-merged-review-recovery (TW-3eo3s2) - #30
Merged
Merged
Conversation
Signed-off-by: JC Grubbs <grubbs.jc@gmail.com>
A bug, chore, or tweak whose fix merged before any submission was recorded could not be closed: sync observes a shelf node only once it is in review, and ordinary submit runs on a branch that has already merged. submit <bug|chore|tweak> --recover-merged now records that merged review with the flags, authorization, integration checkout, and Git evidence checks feature and epic recovery use. The node may be ready, in_progress, check, or in_review; a proposed or terminal node and a node with a live carrier refuse. One merge may be recorded against several nodes, one command each. Recovery writes the record and one audit event, moves no status, and approves no gate. Ordinary sync then crosses each node to done with basis recovered and records every required gate without a pass as a policy violation. Until it crosses, the node leaves the work queues, tiller next offers the sync, and status, show, and list carry the recovered review. Orientation moves to generation 63: the authorization rule and the execute skill name a shelf node's review beside an aggregate's. Signed-off-by: JC Grubbs <grubbs.jc@gmail.com>
Shelf nodes gain the optional recovered_review record and the recovered done basis. Both are additive, and an additive field needs a stamp: an older binary that rewrote a recovered bug, chore, or tweak would drop the record it does not know, and sync would never cross the node. The 15-to-16 migration is stamp-only. It moves no file and preserves work, events, and active reviews. Signed-off-by: JC Grubbs <grubbs.jc@gmail.com>
A recovered shelf review whose result is a contained head with no merge witness crosses only on the human's fast-forward assertion. Its basis is recovered like any other recovered crossing, so sync printed it among the observed crossings. The crossing now carries its evidence (ancestry, content, or human_attested) in the result and in sync's JSON, and human output lists a human_attested one under the assertion block. Signed-off-by: JC Grubbs <grubbs.jc@gmail.com>
Signed-off-by: JC Grubbs <grubbs.jc@gmail.com>
Signed-off-by: JC Grubbs <grubbs.jc@gmail.com>
The warning's closing line names tiller submit --recover-merged, and a node that already holds a recovered review is no longer reported, since its merge is on record and the next sync crosses it. Signed-off-by: JC Grubbs <grubbs.jc@gmail.com>
Signed-off-by: JC Grubbs <grubbs.jc@gmail.com>
Signed-off-by: JC Grubbs <grubbs.jc@gmail.com>
Signed-off-by: JC Grubbs <grubbs.jc@gmail.com>
Member
Author
|
Merged |
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
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.
Extends merged-review recovery to bugs, chores, and tweaks, so a shelf node whose fix merged before any submission was recorded can be closed with an audit trail (TW-3eo3s2).
Change
It follows feature and epic recovery: same flags, run from the integration checkout, same committed-inputs and Git evidence checks,
--prrequired when a remote exists. It accepts a node inready,in_progress,check, orin_review, and refuses a proposed, done, cancelled, or carried node. One PR can be recovered against several nodes, one command each.recovered_reviewand the PR on the node plus onerecover_review.<noun>event. It moves no status and approves no gate; the result listsmissing_gates.tiller synccrosses the node todonewithdone_basis: recovered. Missing required gates are recorded as policy violations at the crossing. A contained fast-forward still waits fortiller sync --accept-fast-forward <node>.status,show, list and node JSON, the readout, andtiller next(new kindsync_recovered) show the recovered review.recovery_identity_changed. Ordinarysubmiton a recovered node refusesrecovery_already_recorded.submit task --recover-mergedstill refuses.Schema and generation
88b0890).docs/spec/distribution.mdrequires a migration for an additive field. The feature commit passes on schema 15 without it, so the stamp can be dropped if it should be batched instead.tiller upgrade --project-onlyafter release, and this repo's own.tiller/needs it before a binary built from this branch will run here.Not in this PR
tiller statusas its next step. Once both merge, it should name this command. Both PRs touchsync.goand the command docs, so the second to merge needsmainmerged in first.This PR also carries two
.tiller/-only commits frommainthat are not yet pushed: the capture and approval of TW-taq0ps, TW-3eo3s2, and TW-xfjsgw.Merge with a merge commit, not a squash, so
tiller synccan record the tweak done.Verification
tiller check tweakgreen: build, tests, lint.