Skip to content
This repository was archived by the owner on Apr 14, 2021. It is now read-only.

[Resolver] Allow mis-matches in bundler requirements, and warn#3871

Merged
homu merged 2 commits into2-0-devfrom
seg-nonexistant-bundler
Jul 24, 2015
Merged

[Resolver] Allow mis-matches in bundler requirements, and warn#3871
homu merged 2 commits into2-0-devfrom
seg-nonexistant-bundler

Conversation

@segiddins
Copy link
Copy Markdown
Contributor

\c @smlance @indirect

@indirect
Copy link
Copy Markdown

Can we avoid an extra loop over all the deps by warning around line 164?

@segiddins
Copy link
Copy Markdown
Contributor Author

Not really, since we won't know if we've actually activated said spec at that point.

@indirect
Copy link
Copy Markdown

Alright then, @homu r+

@homu
Copy link
Copy Markdown
Contributor

homu commented Jul 24, 2015

📌 Commit d6d5ecc has been approved by indirect

homu added a commit that referenced this pull request Jul 24, 2015
[Resolver] Allow mis-matches in bundler requirements, and warn

\c @smlance @indirect
@homu
Copy link
Copy Markdown
Contributor

homu commented Jul 24, 2015

⌛ Testing commit d6d5ecc with merge 9f88e8f...

@homu
Copy link
Copy Markdown
Contributor

homu commented Jul 24, 2015

💔 Test failed - status

@segiddins
Copy link
Copy Markdown
Contributor Author

Failing spec fixed

@indirect
Copy link
Copy Markdown

@homu r+

@homu
Copy link
Copy Markdown
Contributor

homu commented Jul 24, 2015

📌 Commit 32dddd7 has been approved by indirect

homu added a commit that referenced this pull request Jul 24, 2015
[Resolver] Allow mis-matches in bundler requirements, and warn

\c @smlance @indirect
@homu
Copy link
Copy Markdown
Contributor

homu commented Jul 24, 2015

⌛ Testing commit 32dddd7 with merge 164eb29...

@homu
Copy link
Copy Markdown
Contributor

homu commented Jul 24, 2015

💔 Test failed - status

@segiddins
Copy link
Copy Markdown
Contributor Author

@homu retry

homu added a commit that referenced this pull request Jul 24, 2015
[Resolver] Allow mis-matches in bundler requirements, and warn

\c @smlance @indirect
@homu
Copy link
Copy Markdown
Contributor

homu commented Jul 24, 2015

⌛ Testing commit 32dddd7 with merge bff7ccf...

@homu
Copy link
Copy Markdown
Contributor

homu commented Jul 24, 2015

☀️ Test successful - status

@homu homu merged commit 32dddd7 into 2-0-dev Jul 24, 2015
@coilysiren coilysiren modified the milestone: 2.0 — Breaking Changes Oct 9, 2016
bundlerbot added a commit that referenced this pull request Jun 23, 2017
…rect

[2.0] Allow conflicts between bundler dependencies and the current bundler version

### What was the end-user problem that led to this PR?

The problem will occur once 2.0 is released -- there are many gems that declare a `s.dependency "bundler", "~> 1.x"` dependency on bundler. This would essentially make them inoperable with Bundler 2. We want to make adopting 2.0 as pain-free as possible, so hard conflicts are a no-go.

### Was was your diagnosis of the problem?

My diagnosis was that we need a way to allow conflicts on the bundler dependency once 2.0 comes out, so people can use 2.0.

### What is your fix for the problem, implemented in this PR?

My fix introduces a feature flag for allowing these conflicts (enabled on 2.0), which when enabled will ignore bundler dependencies during resolution, and warn in the installer when a conflict would've occurred.

### Why did you choose this fix out of the possible options?

I chose this fix because it has the minimal performance penalty with the feature flag enabled. This is mostly a port of #3871 to master.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants