/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/test_transform.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-24 03:04:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124030458-aj2syolemmi6knri
Fix more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
398
398
        tree.lock_read()
399
399
        self.addCleanup(tree.unlock)
400
400
        self.assertEqual('subtree-revision',
401
 
                         tree.inventory['subtree-id'].reference_revision)
 
401
                         tree.get_reference_revision('subtree-id'))
402
402
 
403
403
    def test_conflicts(self):
404
404
        transform, root = self.get_transform()
2791
2791
 
2792
2792
    def test_iter_changes(self):
2793
2793
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2794
 
        root = revision_tree.inventory.root.file_id
 
2794
        root = revision_tree.get_root_id()
2795
2795
        self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
2796
2796
                          (root, root), ('a', 'a'), ('file', 'file'),
2797
2797
                          (False, False))],
2801
2801
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2802
2802
        changes = preview_tree.iter_changes(revision_tree,
2803
2803
                                            include_unchanged=True)
2804
 
        root = revision_tree.inventory.root.file_id
 
2804
        root = revision_tree.get_root_id()
2805
2805
 
2806
2806
        self.assertEqual([ROOT_ENTRY, A_ENTRY], list(changes))
2807
2807