--- a/lib/piston/commands/import.rb
+++ b/lib/piston/commands/import.rb
@@ -11,16 +11,20 @@ module Piston
         raise Piston::UnknownRepository, @repos.url unless @repos.exists?
 
         @wc = Piston::WorkingCopy.new(@path, :logger => options[:logger])
-        @root = @wc.parent
+        @root = @wc.up
         raise Piston::LocalChangesPending.new(@root.dir) unless @root.status(true).grep(/#{@wc.path}/).empty?
       end
 
       def run
-        @wc.export(@repos.url)
+        @revision = @options[:revision] || @repos.youngest
+        @wc.export(@repos.url, @revision)
         @root.add(@wc.path)
+
+        @wc.propset(Piston::REMOTE_ROOT, @repos.url)
         @wc.propset(Piston::REMOTE_UUID, @repos.uuid)
-        @wc.propset(Piston::REMOTE_REVISION, @repos.youngest)
+        @wc.propset(Piston::REMOTE_REVISION, @revision)
         @wc.propset(Piston::LOCAL_REVISION, @wc.last_changed_revision || 0)
+        @wc.propset(Piston::LOCKED, "*") if @options[:lock]
       end
 
       def debug(&block)

--- a/spec/import_spec.rb
+++ b/spec/import_spec.rb
@@ -28,6 +28,10 @@ describe Piston::Commands::Import, "#run(upstream_url, 'vendor/')" do
     @wc.propget(Piston::REMOTE_UUID, "vendor").should == @upstream.uuid
   end
 
+  it "should have copied the upstream repository's URL as a property on the import path" do
+    @wc.propget(Piston::REMOTE_ROOT, "vendor").should == @upstream.url
+  end
+
   it "should have copied the upstream revision as a property on the import path" do
     @wc.propget(Piston::REMOTE_REVISION, "vendor").should == @upstream.youngest
   end
@@ -100,3 +104,66 @@ describe Piston::Commands::Import, "#run(non_existent_url, 'vendor/')" do
         raise_error(Piston::UnknownRepository)
   end
 end
+
+describe Piston::Commands::Import, "#run(upstream_url, 'vendor/', :lock => true)" do
+  it_should_behave_like "An upstream repository with no copies/renames"
+
+  before do
+    @repos = Piston::Repository.new("file://" + self.tmppath(:repos)).create!
+    @wc = Piston::WorkingCopy.new(self.tmppath(:wc))
+    @wc.checkout(@repos.url)
+
+    Piston::Commands::Import.new(@upstream.url, @wc.path + "vendor", :logger => self.logger, :lock => true).run
+  end
+
+  it "should have locked the folder" do
+    @wc.propget(Piston::LOCKED, "vendor").should == "*"
+  end
+end
+
+describe Piston::Commands::Import, "#run(upstream_url, 'vendor/', :revision => 1)" do
+  it_should_behave_like "An upstream repository with no copies/renames"
+
+  before do
+    @repos = Piston::Repository.new("file://" + self.tmppath(:repos)).create!
+    @wc = Piston::WorkingCopy.new(self.tmppath(:wc))
+    @wc.checkout(@repos.url)
+
+    Piston::Commands::Import.new(@upstream.url, @wc.path + "vendor", :logger => self.logger, :revision => 1).run
+    @wc = @wc.down("vendor")
+  end
+
+  it "should have exported revision 1" do
+    lambda { @wc.cat("LICENSE") }.should raise_error(Piston::WorkingCopy::FileNotFound)
+  end
+
+  it "should remember the remote revision was 1, not HEAD" do
+    @wc.propget(Piston::REMOTE_REVISION).should == 1
+  end
+end
+
+describe Piston::Commands::Import, "#run(upstream_url, 'vendor/', :revision => 2, :lock => true)" do
+  it_should_behave_like "An upstream repository with no copies/renames"
+
+  before do
+    @repos = Piston::Repository.new("file://" + self.tmppath(:repos)).create!
+    @wc = Piston::WorkingCopy.new(self.tmppath(:wc))
+    @wc.checkout(@repos.url)
+
+    Piston::Commands::Import.new(@upstream.url, @wc.path + "vendor", :logger => self.logger, :revision => 2, :lock => true).run
+    @wc = @wc.down("vendor")
+  end
+
+  it "should have exported revision 2" do
+    lambda { @wc.cat("LICENSE") }.should_not raise_error(Piston::WorkingCopy::FileNotFound)
+    lambda { @wc.cat("README") }.should raise_error(Piston::WorkingCopy::FileNotFound)
+  end
+
+  it "should have locked the folder" do
+    @wc.propget(Piston::LOCKED).should == "*"
+  end
+
+  it "should remember the remote revision was 2, not HEAD" do
+    @wc.propget(Piston::REMOTE_REVISION).should == 2
+  end
+end