Skip to content

feat(series): Let a series review stand on the main the series has ported - #3002

Merged
krlmlr merged 1 commit into
claude/k3-split-aaa-auto-testsfrom
claude/series-review-older-base
Oct 18, 2026
Merged

krlmlr merged 1 commit into
claude/k3-split-aaa-auto-testsfrom
claude/series-review-older-base

Conversation

@krlmlr

@krlmlr krlmlr commented Oct 18, 2026

Copy link
Copy Markdown
Contributor

scripts/series-land.sh --review --series --base <ref> builds a series review on an older main that the series has ported, an ancestor of main. A series that has not been forwarded cannot be replayed onto current main, so until now nothing could be reviewed once main moved past the series' last port. It is stacked on #3000.

What it changes

  • With --base <ref>, a series review stands on that main commit instead of main as it is. The ref has to be an ancestor of main, and the review leaves out only the ports in that commit's history.
  • The equality check against main-green is unchanged. The review, without its flavor, still has to equal main-green outside what it hides, so a base the series does not carry is refused with nothing written, as a main it does not carry is.
  • Without --base, a refusal now names --base as the way out, and with --base it says that the ref is not the main the series has ported.
  • A review on an older base prints the base and how many commits main has above it. .claude/skills/series-land/SKILL.md and the header of scripts/series-land.sh describe the option.

Checks

  • scripts/series-land-test.sh passes 141 checks, 11 more than before: an older base reproduces the same SHA as the review on that main, and a base below a commit the series ported, a base with a change the series lacks, and a base not on main are each refused, with the reason named.
  • scripts/series-args-test.sh passes 96 checks.
  • shellcheck -x --source-path=SCRIPTDIR scripts/series-land.sh and the handbook check script are clean.
  • It was used to build draft Review: the R side of the main series, igraph 0.10.17 to 1.0.1-98 (v2) #2995 on ad7d959.

LLM use: this PR was prepared with Claude Code (Claude Opus 5.5), at the maintainer's request.

  • By submitting this pull request, I assign the copyright of my contribution to The igraph development team.

Generated by Claude Code

@krlmlr
krlmlr added this pull request to stack #3001 October 18, 2026 13:08
@krlmlr
krlmlr force-pushed the claude/series-review-older-base branch from 2a8cb5c to 67217e4 Compare October 18, 2026 13:53
…ported

`series-land.sh --review --series` stood on `main` as it is,
so once `main` moved past the series' last port the vendor commits stopped applying,
or the review stopped equalling `main-green`, and nothing could be reviewed until the next port.
With `--base`, the review stands on the older `main` commit the series has ported, which has to be an ancestor of `main`.
It leaves out only the ports of that commit's history,
and is held to `main-green` without its flavor exactly as before,
so a base the series does not carry is refused with nothing written.
Without `--base`, a refusal now names it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01JXnA76zWTu4ZD8BQCSYRpk
@krlmlr
krlmlr force-pushed the claude/series-review-older-base branch from 67217e4 to b6467b5 Compare October 18, 2026 14:40
@krlmlr
krlmlr merged commit 5695749 into main Oct 18, 2026
9 checks passed
@krlmlr
krlmlr deleted the claude/series-review-older-base branch October 18, 2026 18:40
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