Two issues found by exercising the scripts end to end:
- `git checkout -B` refuses to run when the worktree is dirty, so
`make apply FORCE=1` aborted in exactly the situation FORCE exists
to handle. Use `checkout -f -B`; the non-forced path has already
verified the tree is clean, so forcing changes nothing there.
- The commit-count guard claimed the user forgot `make rebuild`, but
deleting a patch file on purpose trips it identically. Say both,
and document the FORCE=1 form in the README's "drop the example
patches" instructions, which would otherwise have failed.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Upstream is a periodic one-way export of xAI's monorepo (linear
"Synced from monorepo" commits, SOURCE_REV pinning the internal SHA)
and explicitly refuses external contributions. So local changes can
never be upstreamed, and upstream re-drops the whole tree on every
sync -- structurally the same problem CraftBukkit has with Mojang.
Adopt the Spigot/BuildTools model: patches/ is the source of truth,
work/ is a disposable build artifact regenerated from upstream.rev
plus patches/.
scripts/apply-patches.sh ~ applyPatches.sh
scripts/rebuild-patches.sh ~ rebuildPatches.sh
scripts/update-upstream.sh forward-ports patches onto a new sync
scripts/setup.sh toolchain: rust 1.94.0, dotslash/protoc
upstream.rev ~ BuildTools versions/*.json pin
format-patch uses --zero-commit so rebases do not rewrite the From
line of every patch, and apply's git clean preserves work/target so
replaying patches does not cost a cold Rust rebuild.
Ships two [EXAMPLE PATCH] commits demonstrating a source edit and a
new-file addition; both are safe to delete.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
