Make dry run merge / transplant throw exceptions #6685
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
The `dryRun` API parameter is different from `returnConflictAsResult`. If a dry run is requested it should produce the same client-side effect as a normal merge / transplant. At the `VersionStore` level this means throwing the same exception regardless of the `dryRun` parameter because `returnConflictAsResult` does not exist at that level.
|
I'll make another PR for testing |
snazy
previously approved these changes
Apr 25, 2023
|
fixed the test - interleaved non-conflict merge :) |
snazy
approved these changes
Apr 25, 2023
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.
The
dryRunAPI parameter is different fromreturnConflictAsResult.If a dry run is requested it should produce the same client-side effect as a normal merge / transplant.
At the
VersionStorelevel this means throwing the same exception regardless of thedryRunparameter becausereturnConflictAsResultdoes not exist at that level.