Skip to content

negotiator/skipping: parse parents before queueing - #150

Merged
ttaylorr-oai merged 0 commit into
codexfrom
tb/codex/skipping-parse-parents
Oct 19, 2026
Merged

ttaylorr-oai merged 0 commit into
codexfrom
tb/codex/skipping-parse-parents

Conversation

@ttaylorr-oai

@ttaylorr-oai ttaylorr-oai commented Oct 19, 2026 •

Copy link
Copy Markdown
Collaborator

Skipping negotiation sorts its queue by commit date, but can insert parents before parsing them. Their dates are still zero, so older ref tips take precedence. This can delay offering a recent common ancestor.

Parse previously unseen parents in push_parent() before adding them to the queue. Parents that cannot be parsed stay out of the queue. The skip-distance rules remain unchanged.

Add a regression test with a topic branch one commit ahead of master and 32 old ref tips. Master's parent must be the second commit offered, right after the topic tip.

The source branch starts at the fork's master so the release controller can replay the patch. The patch is unchanged by the rebase (git range-diff reports equality). A separate commit retains the reviewed CI action pins.

Validation:

@ttaylorr-oai
ttaylorr-oai force-pushed the tb/codex/skipping-parse-parents branch from 70b0823 to 2683778 Compare October 19, 2026 19:45
@ttaylorr-oai
ttaylorr-oai merged commit 999d5f3 into codex Oct 19, 2026
127 of 148 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.

2 participants