chore(fork): Rebuild the integration branch on upstream 0.5.5.9000 - #11
Merged
Merged
Conversation
krlmlr
force-pushed
the
claude/fork-42ve6t
branch
2 times, most recently
from
September 12, 2026 16:03
dcce261 to
2fc7531
Compare
krlmlr
force-pushed
the
claude/fork-42ve6t
branch
from
September 12, 2026 16:49
2fc7531 to
010b868
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The integration branch:
r-lib/cpp11@7d0e4acplus the patch stack, squashed in lexicographic branch order. This is whatkrlmlr.r-universe.devbuilds and whatduckdb-rvendors.Nothing under
.github/workflows/is touched — the tree there is byte-identical to upstream's. CI comes from a long-lived draft pull request fromforkintomaininstead, since upstream'sR-CMD-checkalready triggers onpull_requestagainstmain. The refresh is a Claude skill invoked by a scheduled routine rather than an Actions workflow: resolving these conflicts needs judgement, and a workflow rebuildingforkwould have to push workflow files back on every run, whichGITHUB_TOKENcannot do.Nine patches.
b-warning-copyandf-source-vectorizeare gone — upstream r-lib#493 fixes the root cause of r-lib#295 that the first worked around, and r-lib#492 implements what the second did. Both branches now merge upstream and resolve to the removal of the feature, so the next sync deletes them and records the disposition.The nine, in the order they integrate:
a-fork-infra— Pull config, the refresh skill, docsb-extptr-leak— premature release on moveb-proxy-default-constructor— defaulted copy constructorf-deprecate-explicit—[[deprecated]]on the implicit conversionsf-end-cpp11-ex—END_CPP11_EX()f-extptr-prot—protargumentf-multi-dot—gsub()for the symbol prefixf-types-src-include— types header insrc/include/f-vendor-date—dateandoverwriteEvery patch branch contains upstream's
mainas an ancestor, brought in by a merge rather than a rebase, so each keeps its own history and its merge commit records how its conflicts were resolved.Each of the nine commits here applies to
7d0e4acon its own, and applying all nine in reverse order yields an identical tree — they commute, so the stack has no internal ordering dependency and any one patch can be dropped or upstreamed without disturbing the rest.This branch is rebuilt from scratch on every refresh and should never be merged into by hand; this PR exists to review the state, not to establish a habit.
Verification
Against an install of this branch:
clang-format --dry-run -Werrorclean on every touched header,air format .leaves the tree unchanged, the full R suite passes, and the wholecpp11testC++ suite passes afterclean_dll()— including the fork'sexternal_pointer-C++and upstream'stemplatetest, which is the r-lib#493 regression test and passes without the dropped workaround.🤖 Generated with Claude Code
https://claude.ai/code/session_01K8MneV8KqHYUuC8fWV3X5Q