Rev 2452: Get all working_4 tests passing. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

[Robert Collins]

At http://bazaar.launchpad.net/~bzr/bzr/dirstate

------------------------------------------------------------
revno: 2452
revision-id: robertc at robertcollins.net-20070306012824-syeqpq1kri661vp9
parent: robertc at robertcollins.net-20070306011508-6ncdgqqlxb84esmr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 12:28:24 +1100
message:
  Get all working_4 tests passing.
modified:
  bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
=== modified file 'bzrlib/tests/test_workingtree_4.py'
--- a/bzrlib/tests/test_workingtree_4.py	2007-03-05 04:55:34 +0000
+++ b/bzrlib/tests/test_workingtree_4.py	2007-03-06 01:28:24 +0000
@@ -436,7 +436,7 @@
 
     def test_unique_root_id_per_tree(self):
         # each time you initialize a new tree, it gets a different root id
-        format_name = 'experimental-reference-dirstate'
+        format_name = 'dirstate-with-subtree'
         tree1 = self.make_branch_and_tree('tree1',
             format=format_name)
         tree2 = self.make_branch_and_tree('tree2',
@@ -449,9 +449,11 @@
 
     def test_unique_root_id_per_tree(self):
         # each time you initialize a new tree, it gets a different root id
-        ## format_name = 'experimental-reference-dirstate'
-        tree1 = self.make_branch_and_tree('tree1')
-        tree2 = self.make_branch_and_tree('tree2')
+        format_name = 'dirstate-with-subtree'
+        tree1 = self.make_branch_and_tree('tree1',
+            format=format_name)
+        tree2 = self.make_branch_and_tree('tree2',
+            format=format_name)
         self.assertNotEqual(tree1.get_root_id(), tree2.get_root_id())
         # when you branch, it inherits the same root id
         rev1 = tree1.commit('first post')