Merge documentation improvements.

[jelmer/subvertpy.git] / tests / test_convert.py

diff --git a/tests/test_convert.py b/tests/test_convert.py
index e160330404992377f23a0f69b93b5278c1502ff7..ffe4b8e6d3f3e618cf1ddf33730656dc8ca917db 100644 (file)
--- a/tests/test_convert.py
+++ b/tests/test_convert.py
@@ -18,7 +18,7 @@
 
 from bzrlib.branch import Branch
 from bzrlib.bzrdir import BzrDir
-from bzrlib.errors import NotBranchError
+from bzrlib.errors import NotBranchError, NoSuchFile
 from bzrlib.repository import Repository
 from bzrlib.tests import TestCaseInTempDir
 from bzrlib.trace import mutter
@@ -122,6 +122,16 @@ class TestConversion(TestCaseWithSubversionRepository):
 
         self.assertTrue(Repository.open("e").is_shared())
 
+    def test_shared_import_continue_remove(self):
+        convert_repository(self.repos_url, "e", TrunkBranchingScheme(), True)
+        self.client_update("dc")
+        self.client_delete("dc/trunk")
+        self.client_commit("dc", "blafoo")
+        self.build_tree({'dc/trunk/file': 'otherdata'})
+        self.client_add("dc/trunk")
+        self.client_commit("dc", "change")
+        convert_repository(self.repos_url, "e", TrunkBranchingScheme(), True)
+
     def test_shared_import_continue_with_wt(self):
         convert_repository("svn+"+self.repos_url, "e", 
                 TrunkBranchingScheme(), working_trees=True)
@@ -179,6 +189,9 @@ class TestConversion(TestCaseWithSubversionRepository):
         self.assertTrue(os.path.isdir(os.path.join(self.test_dir, "e", "trunk")))
         self.assertTrue(os.path.isdir(os.path.join(self.test_dir, "e", "branches", "abranch")))
 
+    def test_convert_to_nonexistant(self):
+        self.assertRaises(NoSuchFile, convert_repository,"svn+"+self.repos_url, os.path.join(self.test_dir, "e", "foo", "bar"), TrunkBranchingScheme())
+
     def test_notshared_import(self):
         convert_repository("svn+"+self.repos_url, "e", TrunkBranchingScheme(), 
                            False)
@@ -206,7 +219,7 @@ PROPS-END
         branch_path = os.path.join(self.test_dir, "f")
         convert_repository(dumpfile, branch_path, NoBranchingScheme())
         branch = Repository.open(branch_path)
-        self.assertEqual([], branch.all_revision_ids())
+        self.assertEqual(['svn-v3-undefined:6987ef2d-cd6b-461f-9991-6f1abef3bd59::0'], branch.all_revision_ids())
         Branch.open(branch_path)
 
     def test_dumpfile_open_empty_trunk(self):
@@ -294,3 +307,5 @@ data
         branch = Branch.open(os.path.join(self.test_dir, "e", "trunk"))
         self.assertEqual("file://%s/e/trunk" % self.test_dir, branch.base.rstrip("/"))
         self.assertEqual(generate_svn_revision_id("6987ef2d-cd6b-461f-9991-6f1abef3bd59", 1, 'trunk'), branch.last_revision())
+
+