Add unit test for merge handling on custom data. #14310
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
|
(Standard links)
|
|
Stylechecker is grumpy |
0fd96a4 to
78cd22f
Compare
This also moves the start & stop of the transaction to being further out so a hard fail later doesn't leave a half-merged state
78cd22f to
119664d
Compare
|
test this please |
|
@seamuslee001 can you merge this - should be a no-brainer |
|
Changes seem to be fine, mostly in tests which Jenkins has oked and the shifting of the transaction seems fine |
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.
Overview
Primarily just adding a unit test but also moves the start & stop of the transaction to being further out so a hard fail
later doesn't leave a half-merged state
Before
Less tests
After
More tests
Technical Details
Comments