-
Notifications
You must be signed in to change notification settings - Fork 31
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
Fix stuck resolution #61
Closed
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
fac0e22
to
f7db0ab
Compare
f7db0ab
to
dbe73d9
Compare
The whole backtrack() function is picked apart and put together again. I think this finally makes 100% sense to me, my previous implementation was such a flux. Every round of resolution is now a process of 1. Inheriting criteria from the prvious state 2. Create a new pin When backtracking, the state to backtrack into not only inherits criteria from the "parent" state, but also receives additional incompatibility information from the "child" state that discovered them. So when we backtrack into it, the state's criteria should be modified in-place so subsequence backtracking into it would also know about those incompatibilities. Also (this is the part I got wrong), since the state being backtracked into does not produce a valid pin after the backtracking process (its previous pin is now considered an incompatibility), we SHOULD NOT push a new state; the next round should work on producing a pin on that state.
015761b
to
ba36176
Compare
ba36176
to
e599c22
Compare
Closing in favour of #62, which is basically the same thing, but with cleaner implementation (IMO) and better commits. |
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.
Eventually fix pypa/pip#9011. Currently only a test case that does not pass.