local override for svn only makes sense without a specific revision

2 files changed, 7 insertions, 14 deletions

diff --git a/lib/bundler/source/svn.rb b/lib/bundler/source/svn.rb
index 58e9ab98..0a3b9872 100644
--- a/lib/bundler/source/svn.rb
+++ b/lib/bundler/source/svn.rb
@@ -98,6 +98,12 @@ module Bundler
         path = Pathname.new(path)
         path = path.expand_path(Bundler.root) unless path.relative?
 
+        if options["ref"]
+          raise SVNError, "Cannot use local override for #{name} at #{path} because " \
+            ":ref is specified in Gemfile. Don't specify a revision or use " \
+            "`bundle config --delete` to remove the local override"
+        end
+
         unless path.exist?
           raise SVNError, "Cannot use local override for #{name} because #{path} " \
             "does not exist. Check `bundle config --delete` to remove the local override"
@@ -108,16 +114,7 @@ module Bundler
         # Create a new svn proxy without the cached revision
         # so the Gemfile.lock always picks up the new revision.
         @svn_proxy = SVNProxy.new(path, uri, ref)
-
-        changed = cached_revision && cached_revision != svn_proxy.revision
-
-        if changed && !@unlocked && !svn_proxy.contains?(cached_revision)
-          raise SVNError, "The Gemfile lock is pointing to revision #{cached_revision} " \
-            "but the current branch in your local override for #{name} does not contain such commit. " \
-            "Please make sure your local copy is up to date."
-        end
-
-        changed
+        true
       end
 
       # TODO: actually cache svn specs
diff --git a/lib/bundler/source/svn/svn_proxy.rb b/lib/bundler/source/svn/svn_proxy.rb
index bc992e52..c67a9372 100644
--- a/lib/bundler/source/svn/svn_proxy.rb
+++ b/lib/bundler/source/svn/svn_proxy.rb
@@ -47,10 +47,6 @@ module Bundler
           @revision ||= svn("info --revision #{ref} #{uri_escaped} | grep \"Revision\" | awk '{print $2}'").strip
         end
 
-        def contains?(commit)
-          revision >= commit
-        end
-
         def checkout
           if path.exist?
             Bundler.ui.confirm "Updating #{uri}"