Skip to content
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 failing test for edge gemfile option #4917

Conversation

carlosantoniodasilva
Copy link
Member

This should fix the build for 3-2-stable branch.

@kennyj
Copy link
Contributor

kennyj commented Feb 7, 2012

@carlosantoniodasilva @guilleiguaran

I added this testcase for fixing #4749.
I'm confusing... Why should we use 3-2-stable when using --edge option ?

related to #4912

@carlosantoniodasilva
Copy link
Member Author

@kennyj hm yeah, I didn't check it further, just added the test fix. Seems like the :branch shouldn't really exist, let me check it better.

@guilleiguaran
Copy link
Member

This confusing, generating a new app passing --edge option using 3.2.x also generate apps with conflicts about dependencies.

@carlosantoniodasilva
Copy link
Member Author

Yeah, but with the :branch option:

gem 'sass-rails',   :git => 'git://github.com/rails/sass-rails.git',   :branch => '3-2-stable'
gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git', :branch => '3-2-stable'

I get the same error as result:

Bundler could not find compatible versions for gem "railties":
  In Gemfile:
    sass-rails (>= 0) ruby depends on
      railties (~> 3.2.0) ruby

    rails (>= 0) ruby depends on
      railties (4.0.0.beta)

If I remove the :branch, it bundles successfully.

@kennyj
Copy link
Contributor

kennyj commented Feb 7, 2012

I get same result when I was tackling #4749.

@kennyj
Copy link
Contributor

kennyj commented Feb 7, 2012

BTW, My confirmation way is kennyj@8bf3c6d#commitcomment-921532

@guilleiguaran
Copy link
Member

You're right guys, my commit needs to be reverted

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants