fix: apply_patch move to same path deletes the file - #45316
Open
wzsxxa wants to merge 2 commits into
Open
Conversation
6 tasks
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.
Issue for this PR
Closes #45310
Type of change
What does this PR do?
When apply_patch receives a patch that updates a file and moves it to the same path, the case "move" branch executes write(movePath, newContent) then remove(filePath). Because both paths resolve to the same absolute path, the remove deletes the file just written — the file ends up missing instead of updated.
The fix adds an early check at the top of the case "move" branch: when movePath === filePath, the move degenerates to an update (write + emit a single "change" event, then break). This skips the remove step that would undo the write.
How did you verify your code works?
treats move-to-same-path as an updateinpackages/opencode/test/tool/apply_patch.test.tscovering the same-path move scenario.apply_patch.test.tssuite: 28 pass, 0 fail. No regressions in existing move / update / add / delete tests.Screenshots / recordings
N/A
Checklist
If you do not follow this template your PR will be automatically rejected.