Output a better error message when top level dependencies conflict wi…

…th the lockfile

lib/bundler/resolver.rb

@@ -254,7 +254,13 @@ def resolve(reqs, activated)
 
         if matching_versions.empty?
           if current.required_by.empty?
-            if current.source
+            if base = @base[current.name] and !base.empty?
+              version = base.first.version
+              message = "You have requested:\n" \
+                    "  #{current.name} #{current.requirement}\n\n" \
+                    "The bundle currently has #{current.name} locked at #{version}.\n" \
+                    "Try running `bundle update #{current.name}`"
+            elsif current.source
               name = current.name
               versions = @source_requirements[name][name].map { |s| s.version }
               message  = "Could not find gem '#{current}' in #{current.source}.\n"

spec/install/gems/flex_spec.rb

@@ -209,6 +209,35 @@
       bundle :install
       out.should == nice_error
     end
+  end
+
+  describe "subtler cases" do
+    before :each do
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack"
+        gem "rack-obama"
+      G
+
+      gemfile <<-G
+        source "file:://#{gem_repo1}"
+        gem "rack", "0.9.1"
+        gem "rack-obama"
+      G
+    end
+
+    it "does something" do
+      lambda {
+        bundle "install"
+      }.should_not change { File.read(bundled_app('Gemfile.lock')) }
 
+      out.should include('rack = 0.9.1')
+      out.should include('locked at 1.0.0')
+      out.should include('bundle update rack')
+    end
+
+    it "should work when you update" do
+      bundle "update rack"
+    end
   end
-end
+end