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

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

Merged
merged 2 commits into from
Jun 23, 2017

Conversation

segiddins
Copy link
Member

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.

@segiddins segiddins changed the title Allow conflicts between bundler dependencies and the current bundler version [2.0] Allow conflicts between bundler dependencies and the current bundler version Jun 19, 2017
@segiddins segiddins force-pushed the seg-allow-bundler-dep-conflicts branch from ddc7207 to c35495c Compare June 22, 2017 22:50
@segiddins
Copy link
Member Author

@indirect r?
This is now a blocker for me

@segiddins segiddins requested a review from indirect June 22, 2017 22:50
@indirect
Copy link
Member

@bundlerbot r+

@bundlerbot
Copy link
Collaborator

📌 Commit c35495c has been approved by indirect

@bundlerbot
Copy link
Collaborator

⌛ Testing commit c35495c with merge 7a76c35...

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.
@bundlerbot
Copy link
Collaborator

☀️ Test successful - status-travis
Approved by: indirect
Pushing 7a76c35 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.

3 participants