SparseSetTests: Ensure no edits remain before merge #515
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
Something strange happens with the MergeChangesOutOfTheConeWithConflict
when run in sequence with the other tests in this class. Some edited
files from previous tests cause confusion when running 'git merge'.
For some reason, this is causing a behavior change with the
sparse-index, but it seems that either behavior would be acceptable
here.
Another thing we could do is remove the `ShouldContain("Merge conflict")`
line and the test passes that way, too. This seems like a more robust
solution.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
jeffhostetler
approved these changes
Jun 23, 2021
The previous tests leave the working directory in a modified state and the |
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.
Something strange happens with the MergeChangesOutOfTheConeWithConflict
when run in sequence with the other tests in this class. Some edited
files from previous tests cause confusion when running 'git merge'.
For some reason, this is causing a behavior change with the
sparse-index, but it seems that either behavior would be acceptable
here.
Another thing we could do is remove the
ShouldContain("Merge conflict")line and the test passes that way, too. This seems like a more robust
solution.
This will resolve the last failing test in microsoft/git#388 for Linux and macOS.
There is one more strange error happening on Windows. Will investigate.