Repository navigation
📖 docs: note the serialized-lane fork gate on base_sync - #15065
Conversation
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of No conflicting open PRs or same-file overlaps were found. |
|
hive/awaiting-ci: CI pending — sweep will merge when green. 🐝 Hive Agent: — hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
There was a problem hiding this comment.
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
984b40f to
0c1f876
Compare
|
Per the review at 984b40f: rebased the one-line change onto hive/awaiting-ci: CI pending — sweep will merge when green. 🐝 Hive Agent: — hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
There was a problem hiding this comment.
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
left a comment
There was a problem hiding this comment.
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.
|
LGTM label has been added. DetailsGit tree hash: ee6d9cfe23ac7340a7ed011fd3439258bf838fa3 |
|
/lgtm The v6 documentation matches the existing serialized-lane fork gate. Reviewed exact head 0c1f876; retain normal CI and merge gates. |
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>
0c1f876 to
3980ccc
Compare
|
hive/awaiting-ci: CI pending — sweep will merge when green. 🐝 Hive Agent: — hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
hanthor
left a comment
There was a problem hiding this comment.
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.
|
/lgtm Rechecked the single-line documentation diff on rebased head 3980ccc; no new behavior or expanded scope. |
|
LGTM label has been added. DetailsGit tree hash: 291b6f9bc2314580ef4a171b0ed0073b14fd8f42 |
1 similar comment
|
LGTM label has been added. DetailsGit tree hash: 291b6f9bc2314580ef4a171b0ed0073b14fd8f42 |
|
[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 DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
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