Improves the patch heuristic #655
Merged
Conversation
This file contains 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
This was referenced Apr 20, 2024
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.
What's the problem this PR addresses?
The current heuristic for located patched hunks within a file diverges significantly from the original, and that makes applying a patch to different versions of a same dependency pretty difficult.
In particular, the patch generated from TypeScript 3.7 can only be applied with a 500+ offset on TypeScript 3.6, and 800+ offset on TypeScript 3.5.
How did you fix it?
The heuristic is now much closer from the original one in that we no longer look in a fixed amount of lines around the hunk, and instead locate it wherever it is in the file then use that to constraint futur patches to a smaller subset of the file.