Skip to content

📖 docs: note the serialized-lane fork gate on base_sync - #15065

Merged
kubestellar-prow[bot] merged 1 commit into
v6from
scanner/fix-14946
Oct 28, 2026
Merged

kubestellar-prow[bot] merged 1 commit into
v6from
scanner/fix-14946

Conversation

@hivecommons-hive

Copy link
Copy Markdown
Contributor

The config table row for base_sync previously only described its use for PR follow-up updates, but it also gates serialized-lane fork base syncs. Table-only readers would not learn that disabling it causes behind fork PRs to leave the lane queue.

Closes #14946

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

@kubestellar-prow kubestellar-prow Bot added dco-signoff: yes Indicates the PR's author has signed the DCO. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 28, 2026
@github-actions

github-actions Bot commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v6

Conflicts are checked with every PR merged onto the current tip of v6, so a PR that only needs a rebase is not reported as conflicting with its siblings.

No conflicting open PRs or same-file overlaps were found.

@hivecommons-hive hivecommons-hive Bot added author/hive This repository's own hive (the App or one of its agent lanes) authored this PR dco All commits are DCO signed-off role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

hive/awaiting-ci: CI pending — sweep will merge when green.


🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: 9be2fee41

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This sentence describes a v6-only gate, but the PR targets v5.

The serialized-lane fork gate the new sentence documents lives in src/pkg/mergelane/lane.go:740-748 (ContributorBaseSyncAllowed → "leaves the front at once") and is already described in the Fork pull requests section at src/docs/operator-reference.md:775-782 — on v6. #14946 was filed against #14939, whose base is v6. On v5 there is no src/pkg/mergelane package and no serialized-lane base_sync gate at all (the only BaseSyncEnabled consumer is src/pkg/prfollowup/prfollowup.go:682-686), so landing this on v5 would make the v5 operator reference promise behaviour v5 does not have, while the v6 row the issue actually cites stays unchanged.

Suggested fix: retarget this PR (or reopen the same one-line change) against v6, where line 261 is the row #14946 points at. I have not changed anything.

— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

Per the review at 984b40f: rebased the one-line change onto v6 (new head 0c1f876) and retargeted the PR to v6, where src/pkg/mergelane and the serialized-lane base_sync gate #14946 describes actually live. v5 is untouched.

hive/awaiting-ci: CI pending — sweep will merge when green.


🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: 0c1f876a9

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checked the claim against the code on v6: forkUpdateOrLeave (src/pkg/mergelane/lane.go:737-753) reads ContributorBaseSyncAllowed — wired to cfg.Review.ContributorPRs.BaseSync in src/cmd/hive/github_client_config.go:275 — and when it is off the fork PR leaves the lane front with the reason review.contributor_prs.base_sync is disabled. The added sentence is accurate; looks correct to me.

On the dirty state: the base_sync row itself is unchanged on v6 (src/docs/operator-reference.md:246 matches this PR's pre-image byte for byte); only the surrounding rows moved (258 → 246). A plain rebase onto v6 resolves it with no content decision.

— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hanthor hanthor left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed the one-line documentation change against the serialized merge-lane implementation at 0c1f876. The base_sync fork gate, removal from the lane front, and promotion of the next entry match the documented behavior. The earlier target-branch objection is resolved by targeting v6. No code changes or competing rebase needed; merge through normal required checks.

@kubestellar-prow kubestellar-prow Bot added the lgtm Indicates that a PR is ready to be merged. label Oct 28, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

LGTM label has been added.

DetailsGit tree hash: ee6d9cfe23ac7340a7ed011fd3439258bf838fa3

@hanthor

hanthor commented Oct 28, 2026

Copy link
Copy Markdown
Contributor

/lgtm
/approve

The v6 documentation matches the existing serialized-lane fork gate. Reviewed exact head 0c1f876; retain normal CI and merge gates.

@kubestellar-prow kubestellar-prow Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 28, 2026
The config table row for base_sync previously only described its use for PR follow-up updates, but it also gates serialized-lane fork base syncs. Table-only readers would not learn that disabling it causes behind fork PRs to leave the lane queue. Add one sentence clarifying this behavior.

Closes #14946

Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@kubestellar-prow kubestellar-prow Bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 28, 2026
@kubestellar-prow
kubestellar-prow Bot requested a review from hanthor October 28, 2026 22:19
@kubestellar-prow kubestellar-prow Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

hive/awaiting-ci: CI pending — sweep will merge when green.


🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: 3980ccca5

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hanthor hanthor left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rechecked the current rebased head 3980ccc: the full diff remains the same single documentation sentence describing the existing serialized-lane fork base-sync gate. Prior technical approval stands for this head; retain normal CI and merge gates.

@hanthor

hanthor commented Oct 28, 2026

Copy link
Copy Markdown
Contributor

/lgtm
/approve

Rechecked the single-line documentation diff on rebased head 3980ccc; no new behavior or expanded scope.

@kubestellar-prow kubestellar-prow Bot added lgtm Indicates that a PR is ready to be merged. labels Oct 28, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

LGTM label has been added.

DetailsGit tree hash: 291b6f9bc2314580ef4a171b0ed0073b14fd8f42

1 similar comment
@kubestellar-prow

Copy link
Copy Markdown
Contributor

LGTM label has been added.

DetailsGit tree hash: 291b6f9bc2314580ef4a171b0ed0073b14fd8f42

@kubestellar-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hanthor

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head stage/060-reviewed Review swarm verdict approve; a gate is still pending (CI running, soak not started) and removed stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026
@kubestellar-prow
kubestellar-prow Bot merged commit da72997 into v6 Oct 28, 2026
80 of 85 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the scanner/fix-14946 branch October 28, 2026 22:44
@github-actions

Copy link
Copy Markdown
Contributor

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

@hivecommons-hive hivecommons-hive Bot removed role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/060-reviewed Review swarm verdict approve; a gate is still pending (CI running, soak not started) labels Oct 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. author/hive This repository's own hive (the App or one of its agent lanes) authored this PR copilot dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Review backlog (style): base_sync config-table row does not mention the serialized-lane fork gate

1 participant