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

Make version conflict messages better #6647

Merged
merged 5 commits into from
Aug 14, 2018

Conversation

segiddins
Copy link
Member

@segiddins segiddins commented Aug 1, 2018

This is a WIP. Need to wait until CocoaPods/Molinillo#99 is merged & released

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

The problem was Bundler version messages could be confusing.

Closes #6642
Closes #6620

What was your diagnosis of the problem?

My diagnosis was we barf out a bunch of "conflicts", not all of which are actually conflicts. We could also print a whole bunch of requirements that didn't actually contribute to the conflict at hand.

Messaging was also super weird when there were required_ruby_version conflicts, since we called "ruby" a gem.

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

Improves Bundler version conflict messages in multiple cases. (conflict on required_ruby_version, conflict on 2.0 containing redundant platforms, conflict on 2.0 not being reduced to minimal form, showing irrelevant conflicts that dont actually conflict, actually reducing all type of conflicts to the minimal set).

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

I chose this fix because...

@indirect
Copy link
Member

indirect commented Aug 1, 2018

I am very excited about this, thanks @segiddins!

Copy link
Member

@indirect indirect left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yesssssss

@colby-swandale
Copy link
Member

Thanks! @bundlerbot r+

@bundlerbot
Copy link
Collaborator

📌 Commit 141936b has been approved by colby-swandale

@colby-swandale colby-swandale added this to the 1.16.4 milestone Aug 5, 2018
@bundlerbot
Copy link
Collaborator

⌛ Testing commit 141936b with merge 487ab67...

bundlerbot added a commit that referenced this pull request Aug 5, 2018
…, r=colby-swandale

[DNM] Make version conflict messages better

This is a WIP. Need to wait until CocoaPods/Molinillo#99 is merged & released

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

The problem was Bundler version messages could be confusing.

Closes #6642
Closes #6620

### What was your diagnosis of the problem?

My diagnosis was we barf out a bunch of "conflicts", not all of which are actually conflicts. We could also print a whole bunch of requirements that didn't _actually_ contribute to the conflict at hand.

Messaging was also super weird when there were `required_ruby_version` conflicts, since we called "ruby" a gem.

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

Improves Bundler version conflict messages in multiple cases. (conflict on `required_ruby_version`, conflict on 2.0 containing redundant platforms, conflict on 2.0 not being reduced to minimal form, showing irrelevant conflicts that dont actually conflict, actually reducing all type of conflicts to the minimal set).

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

I chose this fix because...
@bundlerbot
Copy link
Collaborator

💔 Test failed - status-travis

@colby-swandale
Copy link
Member

(sorry I forgot the note at the top)

@colby-swandale colby-swandale removed this from the 1.16.4 milestone Aug 5, 2018
@segiddins segiddins force-pushed the segiddins/conflict-message-improvements branch from 114d9ae to fcc4b60 Compare August 7, 2018 06:08
@segiddins segiddins changed the title [DNM] Make version conflict messages better Make version conflict messages better Aug 7, 2018
@indirect
Copy link
Member

@bundlerbot r+

@bundlerbot
Copy link
Collaborator

📌 Commit 48f6a18 has been approved by indirect

@bundlerbot
Copy link
Collaborator

⌛ Testing commit 48f6a18 with merge 33166ba...

bundlerbot added a commit that referenced this pull request Aug 14, 2018
…, r=indirect

Make version conflict messages better

~~This is a WIP. Need to wait until CocoaPods/Molinillo#99 is merged & released~~

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

The problem was Bundler version messages could be confusing.

Closes #6642
Closes #6620

### What was your diagnosis of the problem?

My diagnosis was we barf out a bunch of "conflicts", not all of which are actually conflicts. We could also print a whole bunch of requirements that didn't _actually_ contribute to the conflict at hand.

Messaging was also super weird when there were `required_ruby_version` conflicts, since we called "ruby" a gem.

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

Improves Bundler version conflict messages in multiple cases. (conflict on `required_ruby_version`, conflict on 2.0 containing redundant platforms, conflict on 2.0 not being reduced to minimal form, showing irrelevant conflicts that dont actually conflict, actually reducing all type of conflicts to the minimal set).

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

I chose this fix because...
@indirect indirect added this to the 2.0 — Breaking Changes milestone Aug 14, 2018
@bundlerbot
Copy link
Collaborator

☀️ Test successful - status-travis
Approved by: indirect
Pushing 33166ba 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
4 participants