Restore and re-apply all VMR patches always #3690
Merged
Conversation
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
premun
commented
Jun 27, 2024
oleksandr-didyk
previously approved these changes
Jun 27, 2024
src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrManagerBase.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrInitializer.cs
Outdated
Show resolved
Hide resolved
This reverts commit 3799e07.
oleksandr-didyk
approved these changes
Jun 27, 2024
Member
Author
|
Oh no, I merged the wrong PR 😅 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Fixes a problem found in dotnet/sdk#41793. The problem is that if SDK is the root repo where VMR patches are stored, and SDK gets pulled into the VMR, we must restore the previous versions of those VMR patches in the SDK before the new SDK changes were merged into the VMR.
This manifests in us trying to restore VMR patches that will only be added during the sync later.
The new code stops evaluating which VMR patches must be removed and strips all VMR patches always and then returns all back. So this simplifies the code a bit.