Proposal: Change how patches are managed and applied - #2967
Open
lex-ibm wants to merge 4 commits into
Open
Conversation
Patches apply as one git commit per patch on the pristine upstream checkout and are stored as git-format-patch mailboxes, imported with `git am`. Import/export is driven by Electron's patch core, vendored verbatim under dev/lib (MIT, see dev/lib/NOTICE), with dev/lib/stack.py sequencing the VSCodium directories. Each patch directory carries a `.patches` manifest listing its files in apply order. Branding placeholders stay raw in the commits and are resolved in the working tree at build time, so patch files round-trip unchanged. `./dev/export.sh` regenerates patch files from the commits and self-verifies by re-importing and comparing trees. The build refuses to discard uncommitted edits or commits not yet exported; `-f` overrides.
Describe the commit-per-patch model, the `.patches` manifests, the authoring and build tree states, and the edit/add/rebase recipes.
The patch stack is imported by a python helper, so every job that runs build.sh needs python: drop the x64-only condition on the macOS setup-python steps and add the step to the spearhead builds.
lex-ibm
force-pushed
the
insider
branch
6 times, most recently
from
August 17, 2026 23:25
dfd21e5 to
c7f1d43
Compare
Re-sync the patch stack to VS Code 1.132.0 and re-export every patch as a mailbox with its subject, rationale and original authorship restored.
lex-ibm
marked this pull request as ready for review
August 18, 2026 13:31
Member
|
Ok, I've tested it. Here, what I like:
What need to be improved:
|
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
2 participants
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.
This PR has significant contributions made by AI.
My idea was to use the same mechanism as Electron does to apply their patches, mostly because I became tired of having to figure out what was mine and what was other people's work.
This is still a WIP, but feedback is always welcomed.