Rev 2441: Fix up root id for some more comparison tests in file:///home/mbp/bzr/Work/subtree/

Martin Pool mbp at sourcefrog.net
Mon Mar 5 05:58:25 GMT 2007


------------------------------------------------------------
revno: 2441
revision-id: mbp at sourcefrog.net-20070305055824-8pw7naoogm3ujbrx
parent: mbp at sourcefrog.net-20070305055805-xdc5z7z2o6c0n7ok
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: subtree
timestamp: Mon 2007-03-05 16:58:24 +1100
message:
  Fix up root id for some more comparison tests
modified:
  bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
=== modified file 'bzrlib/tests/intertree_implementations/test_compare.py'
--- a/bzrlib/tests/intertree_implementations/test_compare.py	2007-03-05 05:49:51 +0000
+++ b/bzrlib/tests/intertree_implementations/test_compare.py	2007-03-05 05:58:24 +0000
@@ -662,6 +662,7 @@
     def test_missing_and_renamed(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
+        tree2.set_root_id(tree1.get_root_id())
         self.build_tree(['tree1/file'])
         tree1.add(['file'], ['file-id'])
         self.build_tree(['tree2/directory/'])
@@ -737,6 +738,7 @@
     def test_default_ignores_unversioned_files(self):
         tree1 = self.make_branch_and_tree('tree1')
         tree2 = self.make_to_branch_and_tree('tree2')
+        tree2.set_root_id(tree1.get_root_id())
         self.build_tree(['tree1/a', 'tree1/c',
                          'tree2/a', 'tree2/b', 'tree2/c'])
         tree1.add(['a', 'c'], ['a-id', 'c-id'])




More information about the bazaar-commits mailing list