/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/intertree_implementations/test_compare.py

Fix up root id for some more comparison tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
662
662
    def test_missing_and_renamed(self):
663
663
        tree1 = self.make_branch_and_tree('tree1')
664
664
        tree2 = self.make_to_branch_and_tree('tree2')
 
665
        tree2.set_root_id(tree1.get_root_id())
665
666
        self.build_tree(['tree1/file'])
666
667
        tree1.add(['file'], ['file-id'])
667
668
        self.build_tree(['tree2/directory/'])
737
738
    def test_default_ignores_unversioned_files(self):
738
739
        tree1 = self.make_branch_and_tree('tree1')
739
740
        tree2 = self.make_to_branch_and_tree('tree2')
 
741
        tree2.set_root_id(tree1.get_root_id())
740
742
        self.build_tree(['tree1/a', 'tree1/c',
741
743
                         'tree2/a', 'tree2/b', 'tree2/c'])
742
744
        tree1.add(['a', 'c'], ['a-id', 'c-id'])