Default tests to tree-level conflicts #3746
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
2 tasks
ilyagr
force-pushed
the
treedefault
branch
2 times, most recently
from
14e598e
to
ac9851f
Compare
martinvonz
reviewed
May 24, 2024
Comment on lines
-8
to
-10
| [format] | ||
| tree-level-conflicts = true | ||
|
|
There was a problem hiding this comment.
I think we generally leave defaults in the file if possible so jj config list --include-defaults shows it.
| @@ -50,7 +50,12 @@ fn diff_stream_equals_iter(tree1: &MergedTree, tree2: &MergedTree, matcher: &dyn | |||
|
|
|||
| #[test] | |||
| fn test_from_legacy_tree() { | |||
| let test_repo = TestRepo::init(); | |||
| // TODO: Find out why this test does not works with tree-level conflicts | |||
There was a problem hiding this comment.
I think this test is explicitly about checking that an existing legacy tree can be read, but if we enable tree-level conflicts by defaults then the will be no legacy tree, right?
4 tasks
|
I strongly suspect this was obsoleted by some recent PRs of Martin's. |
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.
This was essential for demoing #3223, or #2895, or maybe both.
Checklist
If applicable:
CHANGELOG.md