Fix VMR patch re-application - #4144
Merged
Merged
Conversation
premun
force-pushed
the
prvysoky/reapply
branch
from
November 12, 2024 11:43
9603932 to
837c759
Compare
oleksandr-didyk
approved these changes
Nov 12, 2024
Contributor
|
rolled out with #4145 |
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
3 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.
Encountered problems like in dotnet/sdk#44757 or dotnet/sdk#44751 where a patch being applied together with incoming changes for a repo that is also being patched can end up with failures.
Instead of several rounds of restoring and reapplication of VMR patches, we strip all at the beginning and apply all at the end of the sync which makes it much simpler and less error prone.