Repository navigation
fix: rebase copilot-removal patch for vscode 1.145.2 - #128
Merged
Merged
Conversation
1.145.2 changed four files that the patch deletes (copilotAgent.ts, copilotAgentSession.ts and their tests), so the deletion hunks no longer matched. Regenerate those four deletion hunks from the 1.145.2 tree and bump upstream/stable.json to the 1.145.2 tag commit. Refs #127
sbs44
approved these changes
Nov 6, 2026
Contributor
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.
Fixes the 1.145.2 build failure (run https://github.com/bradford-tech/code/actions/runs/42230509524).
Refs #127
Root cause
VS Code 1.145.2 (
c4453f8) changed four files that51-ext-copilot-remove-it.patchdeletes:src/vs/platform/agentHost/node/copilot/copilotAgent.tssrc/vs/platform/agentHost/node/copilot/copilotAgentSession.tssrc/vs/platform/agentHost/test/node/copilotAgent.test.tssrc/vs/platform/agentHost/test/node/copilotAgentSession.test.tsBecause the preimage of each deletion hunk no longer matched,
git applyrejected them../dev/dry-apply-patches.shshowed this was the only broken patch.Fix
upstream/stable.jsonto1.145.2/c4453f8ea430795f941c1b2ff6c9321135a74a02. I checked the commit withgit ls-remoteagainst the tag.Regenerated-patch checklist
!!APP_NAME!!before and after, and no literal app name was substituted in.Verification
./dev/dry-apply-patches.sh: all patches apply cleanly.CI_BUILD=yes ./dev/ci-verify.sh --commit c4453f8ea430795f941c1b2ff6c9321135a74a02: PASS (compile).compile-srcandcompilationboth finished with 0 errors.--full(vscode-min-prepack). This runner has 7.5 GB RAM, and the playbook says that step runs out of memory below about 8 GB.