--- a/lib/piston/commands/switch.rb
+++ b/lib/piston/commands/switch.rb
@@ -36,15 +36,13 @@ module Piston
         local_revision = local_revision.succ
 
         new_info = YAML::load(svn(:info, new_repos))
-        raise Piston::CommandError unless uuid == new_info['Repository UUID']
+        raise Piston::CommandError, "Switching repositories is not supported at this time\nYou initially imported from #{uuid}, but are now importing from #{new_info['Repository UUID']}" unless uuid == new_info['Repository UUID']
 
         logging_stream.puts "  Fetching remote repository's latest revision and UUID"
         info = YAML::load(svn(:info, "#{repos}@#{remote_revision}"))
         return skip(dir, "Repository UUID changed\n  Expected #{uuid}\n  Found    #{info['Repository UUID']}\n  Repository: #{repos}") unless uuid == info['Repository UUID']
 
         new_remote_rev = new_info['Last Changed Rev'].to_i
-        return skip(dir, "unchanged from revision #{remote_revision}", false) if remote_revision == new_remote_rev
-
         revisions = (remote_revision .. (revision || new_remote_rev))
 
         logging_stream.puts "  Restoring remote repository to known state at r#{revisions.first}"

--- /dev/null
+++ b/specs/switch_spec.rb
@@ -0,0 +1,73 @@
+require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
+require "piston"
+require "piston/command"
+require "piston/commands/import"
+
+context "switching to a branch in the same repository (without local mods)" do
+  include PistonCommandsHelper
+
+  context_setup do
+    @remote_repos = Repository.new
+    @rwc = WorkingCopy.new(@remote_repos)
+    @rwc.checkout
+    @rwc.mkdir("/trunk")
+
+    @rwc.add("/trunk/README", "this is line 1")
+    @rwc.commit
+
+    @rwc.add("/trunk/main.c", "int main() { return 0; }")
+    @rwc.commit
+
+    @rwc.mkdir("/branches")
+    @rwc.copy("/trunk", "/branches/stable")
+    @rwc.commit
+
+    @rwc.change("/trunk/main.c", "int main() { /* trunk */ return 0; }")
+    @rwc.change("/branches/stable/main.c", "int main() { /* branch */ return 0; }")
+    @rwc.commit
+
+    @local_repos = Repository.new
+    @lwc = WorkingCopy.new(@local_repos)
+    @lwc.checkout
+
+    @lwc.propset("svn:externals", %Q(vendor #{@remote_repos.url + "/trunk"}), ".")
+    @lwc.commit
+    @lwc.update
+
+    convert(@lwc.path)
+    @lwc.commit
+    @lwc.update
+  end
+
+  setup do
+    switch(@remote_repos.url + "/branches/stable", @lwc.path + "/vendor")
+  end
+
+  teardown do
+    @lwc.destroy
+    @lwc.checkout
+  end
+
+  context_teardown do
+    @lwc.destroy
+    @local_repos.destroy
+    @rwc.destroy
+    @remote_repos.destroy
+  end
+
+  specify "gets the fulltext of the branch" do
+    @lwc.cat("/vendor/main.c").should == "int main() { /* branch */ return 0; }"
+  end
+
+  specify "changes the root of the pistoned dir to the new import location" do
+    @lwc.propget(Piston::ROOT, "vendor").should == @remote_repos.url + "/branches/stable"
+  end
+
+  specify "keeps the upstream repository's UUID unchanged" do
+    @lwc.propget(Piston::UUID, "vendor").should == @remote_repos.uuid
+  end
+
+  specify "remembers the upstream revision we pistoned from" do
+    @lwc.propget(Piston::REMOTE_REV, "vendor").should == "4"
+  end
+end