Skip to content

Preserve qualified merge reconstruction through admission transport - #33

Merged
nybarius merged 2 commits into
mainfrom
fix/qualified-merge-reland-20261004
Oct 4, 2026
Merged

nybarius merged 2 commits into
mainfrom
fix/qualified-merge-reland-20261004

Conversation

@nybarius

@nybarius nybarius commented Oct 4, 2026

Copy link
Copy Markdown
Owner

An external admission command can receive a merge-preservation receipt and qualify an authored-in-merge change for ordered reconstruction. SVRF currently wraps its reland:REFUSED:MERGE_LOSS line as an ordinary check failure, so the train holds it instead of reconstructing the same final tree.

Preserve this qualified external result through Admission and the existing RELAND decision. Built-in history loss, bare/unqualified loss, mixed diagnostic failures, and reland=False continue to hold. The external admission owner remains responsible for checking preservation before emitting the qualified line.

Committed RED df67d33 precedes the minimal rule change. The unchanged new tests exercise the actual command-to-Admission-to-rules route and its negative cases. Full make test: 366 tests passed on Python 3.12.14, including the demo and denylist. The first full run exposed this container PID 1 retaining a killed sleep child as a zombie; the unchanged suite passes under a Linux child-subreaper wrapper. Both observations are retained locally. CI owns the other Python versions, proofs, and container smoke.

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 4, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-04T09:24:39.952592Z 23bfbe1 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@nybarius
nybarius merged commit 92a44bf into main Oct 4, 2026
8 checks passed
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