Add a test for mergiraf-style merge drivers specifically#2472
Merged
Conversation
Motivated by gitbutlerapp/gitbutler#10509. For all that I can tell it should work, and IRL tests also showed that. Co-authored-by: Sebastian Thiel <sebastian.thiel@icloud.com>
EliahKagan
reviewed
Mar 17, 2026
| } | ||
|
|
||
| #[test] | ||
| #[cfg(not(windows))] // assertions aren't handling Windows paths, and there is no need. |
Member
There was a problem hiding this comment.
Even though not strictly needed, would it be valuable for this test to be extended to be able to run (and pass), or do you not recommend that this be attempted?
Member
Author
There was a problem hiding this comment.
I wouldn't stop you if you were to take a look. While it adds complexity here it's probably good to know that this can work on windows as well.
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
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.
Based on gitbutlerapp/gitbutler#10509.
Tasks
Let's keep the test, but unfortunately there is no reproduction, still.