Rev 3162: Handle a nonversioned child entries. in http://people.ubuntu.com/~robertc/baz2.0/inventory.journalled

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/inventory.journalled

------------------------------------------------------------
revno: 3162
revision-id:robertc at robertcollins.net-20080103211123-g2hjn01pfk698gjj
parent: robertc at robertcollins.net-20080103204934-foyz17qpiewosdvy
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inventory.journalled
timestamp: Fri 2008-01-04 08:11:23 +1100
message:
  Handle a nonversioned child entries.
modified:
  bzrlib/tests/test_journalled_inv.py test_journalled_inv.-20080103012121-ny2w9slze5jgty8i-1
=== modified file 'bzrlib/tests/test_journalled_inv.py'
--- a/bzrlib/tests/test_journalled_inv.py	2008-01-03 20:49:34 +0000
+++ b/bzrlib/tests/test_journalled_inv.py	2008-01-03 21:11:23 +0000
@@ -88,6 +88,25 @@
         self.assertEqual(StringIO(root_only_lines).readlines(),
             journal.delta_to_lines(NULL_REVISION, delta))
 
+    def test_unversioned_non_root_errors(self):
+        old_inv = Inventory(None)
+        new_inv = Inventory(None)
+        root = new_inv.make_entry('directory', '', None, 'TREE_ROOT')
+        root.revision = 'a at e\xe5ample.com--2004'
+        new_inv.add(root)
+        non_root = new_inv.make_entry('directory', 'foo', root.file_id, 'id')
+        new_inv.add(non_root)
+        delta = self.make_inv_delta(old_inv, new_inv)
+        journal = journalled_inventory.InventoryJournal()
+        self.assertRaises(errors.BzrError,
+            journal.delta_to_lines, NULL_REVISION, delta)
+
+# unversioned root errors when not enabled
+# unknown kind raises
+# tree-reference when not enabled
+
+class TestContent(TestCase):
+
     def test_dir(self):
         entry = inventory.make_entry('directory', 'a dir', None)
         self.assertEqual('dir', journalled_inventory._directory_content(entry))
@@ -145,8 +164,3 @@
         entry = inventory.make_entry('tree-reference', 'a tree', None)
         self.assertRaises(errors.BzrError,
             journalled_inventory._reference_content, entry)
-
-# unversioned entry that is not root errors
-# unversioned root errors when not enabled
-# unknown kind raises
-# tree-reference when not enabled