-
Notifications
You must be signed in to change notification settings - Fork 993
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Improve graph conflict message when Conan can't show one of the conflicting recipes #13946
Merged
czoido
merged 8 commits into
conan-io:release/2.0
from
AbrilRBS:rr/improve-conflict-message
Jun 13, 2023
Merged
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
ba76b0f
Improve graph conflict message when Conan can't show one of the confl…
AbrilRBS 5e49947
Merge branch 'release/2.0' into rr/improve-conflict-message
AbrilRBS aeab1e0
Output conflicting nodes in html graph output
AbrilRBS 4371d5b
From now uses the id
AbrilRBS 161dbb0
New look for the errors
AbrilRBS 83c2e8c
WIP test
AbrilRBS c6131e4
Address look into reviews
AbrilRBS 3655121
Fix misisng line
AbrilRBS File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -64,3 +64,7 @@ def _game_conanfile(version, reverse=False): | |
c.assert_overrides({"math/1.0": [f"math/{v}"], | ||
"math/1.0.1": [f"math/{v}#8e1a7a5ce869d8c54ae3d33468fd657c"]}) | ||
c.assert_listed_require({f"math/{v}": "Cache"}) | ||
|
||
c.run("install --requires=engine/1.0 --requires=ai/1.0", assert_error=True) | ||
assert "Conflict between math/1.0.1 and math/1.0 in the graph" | ||
assert "Conflict originates from ai/1.0" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Check that |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would print this
--format=html
(with redirect> graph.html
) in all cases, even the "simple" part of theif
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can it print actual arguments here instead of
...
? so it could be copy-pasted easily.