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

Boost conflicts during fusion - fixes #2922 #2928

Merged
merged 26 commits into from Dec 5, 2017

Conversation

Projects
None yet
2 participants
@forki
Member

forki commented Dec 4, 2017

fixes "loop of doom" by using conflict boost

@matthid for some reason we forgot to boost when we report conflicts.
This is now dramatically faster and even reports the conflict along the way

@forki forki requested a review from matthid Dec 4, 2017

forki added some commits Dec 4, 2017

Merge commit '7e1f479b1d5e65aa6202ed742aed256bdb44f719' into boost
# Conflicts:
#	tests/Paket.Tests/Resolver/PrereleaseSpecs.fs
@0x53A

This comment has been minimized.

Show comment
Hide comment
@0x53A

0x53A Dec 4, 2017

Contributor

Just wanted to confirm that I hit the same issue - paket update running forever - which was fixed by building from this branch.

Contributor

0x53A commented Dec 4, 2017

Just wanted to confirm that I hit the same issue - paket update running forever - which was fixed by building from this branch.

@forki

This comment has been minimized.

Show comment
Hide comment
@forki

forki Dec 4, 2017

Member

the problem with this branch is that I'm still hitting couple of other edge cases

Member

forki commented Dec 4, 2017

the problem with this branch is that I'm still hitting couple of other edge cases

forki added some commits Dec 4, 2017

@forki forki closed this Dec 5, 2017

@forki forki reopened this Dec 5, 2017

forki added some commits Dec 5, 2017

@forki forki merged commit cf7706f into master Dec 5, 2017

0 of 4 checks passed

continuous-integration/appveyor/branch AppVeyor build failed
Details
continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/travis-ci/push The Travis CI build failed
Details

@forki forki deleted the boost branch Dec 5, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment