Fix most unhelpful conflict explanation message by merging all formulas together #6106
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
kit-ty-kate
added
the
PR: QUEUED
kit-ty-kate
commented
Jul 18, 2024
This was referenced Jul 18, 2024
1 task
kit-ty-kate
removed
the
PR: QUEUED
kit-ty-kate
force-pushed
the
fix-most-4373
branch
from
49e7d7e
to
3b9d803
Compare
|
related to #5130 too |
rjbou
reviewed
Aug 20, 2024
There was a problem hiding this comment.
I've put some remarks on the code (non linear) but the idea is good, it is working well!
With the third commit, the title of the PR should change to something more general like "Conflict messages: fix most of unhelpful explanations and display full dependency path"
rjbou
approved these changes
Sep 3, 2024
kit-ty-kate
force-pushed
the
fix-most-4373
branch
from
300225f
to
9a05832
Compare
|
squashed |
kit-ty-kate
force-pushed
the
fix-most-4373
branch
from
9a05832
to
3678025
Compare
…en showing conflict explanations
kit-ty-kate
force-pushed
the
fix-most-4373
branch
from
3678025
to
6f781f1
Compare
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.
Fixes #4373
This PR fixes it by:
ChainSet.precludes)In some cases this makes the message as verbose but at least it is correct and helpful.
We can try to make them even more readable in a later work but at least this fixes the biggest issue at hand: conflict messages telling lies and being unreadable.
Built on top of #5210Also fixes #5422 (alcotest now only takes 45s to print the explanation instead of +infinit)