Fix branch coverage merging when line numbers differ #11932
Closed
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
It may be that two SourceFileCoverage objects represent different parts of a source file, and so contain information for different line numbers. We should not fail to merge the branch information in these objects. This refines the branch merging logic to operate "line by line". We still require consistency in the inputs if both merge inputs have branch information for the same line.
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.
It may be that two SourceFileCoverage objects represent different parts
of a source file, and so contain information for different line numbers.
We should not fail to merge the branch information in these objects.
This refines the branch merging logic to operate "line by line". We
still require consistency in the inputs if both merge inputs have branch
information for the same line.