Rev 4601: Set tree root ID in tree transform tests that don't care about the root id. in http://bazaar.launchpad.net/~lifeless/bzr/tree-transform-set-roots

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/tree-transform-set-roots

------------------------------------------------------------
revno: 4601
revision-id: robertc at robertcollins.net-20090813013315-xatr2leyof6122dj
parent: pqm at pqm.ubuntu.com-20090812222828-fdlyshwsomwvfaf2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: tree-transform-set-roots
timestamp: Thu 2009-08-13 11:33:15 +1000
message:
  Set tree root ID in tree transform tests that don't care about the root id.
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py	2009-07-20 06:06:22 +0000
+++ b/bzrlib/tests/test_transform.py	2009-08-13 01:33:15 +0000
@@ -2146,6 +2146,7 @@
     def create_tree(self):
         tree = self.make_branch_and_tree('.')
         self.build_tree_contents([('a', 'content 1')])
+        tree.set_root_id('TREE_ROOT')
         tree.add('a', 'a-id')
         tree.commit('rev1', rev_id='rev1')
         return tree.branch.repository.revision_tree('rev1')
@@ -2667,10 +2668,12 @@
 
     def test_merge_preview_into_workingtree(self):
         tree = self.make_branch_and_tree('tree')
+        tree.set_root_id('TREE_ROOT')
         tt = TransformPreview(tree)
         self.addCleanup(tt.finalize)
         tt.new_file('name', tt.root, 'content', 'file-id')
         tree2 = self.make_branch_and_tree('tree2')
+        tree2.set_root_id('TREE_ROOT')
         pb = progress.DummyProgress()
         merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
                                          pb, tree.basis_tree())