fix: rebase 11-update-use-github-release patch onto VS Code 1.124.0#13
Closed
claude[bot] wants to merge 1 commit into
Closed
fix: rebase 11-update-use-github-release patch onto VS Code 1.124.0#13claude[bot] wants to merge 1 commit into
claude[bot] wants to merge 1 commit into
Conversation
VS Code 1.124.0 restructured doApplyUpdate in updateService.win32.ts:
moved the spawn() block inside an else { } branch guarded by a new
mutex-based isInstallerActive() check, adding one tab of indentation
and a blank line before const child = spawn().
Hunk #11 of the patch was searching for the old 2-tab-indented context
without the blank line — no longer present in 1.124.0 — causing a
patch rejection.
Fix: regenerate the win32.ts section of the patch from the 1.124.0
base so the spawn MSI/Setup conditional lands inside the existing
else { } block with correct 3-tab indentation and blank-line context.
Also bump upstream/stable.json to 1.124.0 so the PR build targets
the same upstream commit the patch is written against.
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
1 participant
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.
Root Cause
VS Code 1.124.0 significantly restructured
doApplyUpdateinupdateService.win32.ts:The spawn block was moved inside an
else { }branch guarded by a new mutex-basedisInstallerActive()check (added to prevent duplicate Inno Setup instances). This changed:await pfs.Promises.writeFile(...)andconst child = spawn(...)Patch hunk #11 (
@@ -357,20 ...) was searching for the old 2-tab-indented context without the blank line, which no longer exists in 1.124.0.--ignore-whitespacedoesn't bridge blank lines, causing the patch rejection.Fix
Regenerated the entire
updateService.win32.tssection of11-update-use-github-release.patchfrom the 1.124.0 base so the MSI/Setup spawn conditional lands correctly inside the existing} else {block with 3-tab indentation and the blank-line context.Also bumps
upstream/stable.jsonfrom 1.123.0 → 1.124.0 so the PR build targets the same upstream commit the patch is written against (PR builds use the pinned version, not upstream-latest).Verification
Refs #12