/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 breezy/tests/blackbox/test_join.py

Add follow_tree_references argument to Tree.iter_entries_by_dir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_join.py
76
76
            self.assertEqual('file1', sub_tree.id2path(b'file1-id'))
77
77
            self.assertEqual(subtree_root_id, sub_tree.path2id(''))
78
78
            self.assertEqual('', sub_tree.id2path(subtree_root_id))
79
 
            self.assertIs(None, base_tree.path2id('subtree/file1'))
 
79
            self.assertEqual(
 
80
                sub_tree.path2id('file1'), base_tree.path2id('subtree/file1'))
80
81
 
81
82
        base_tree.lock_read()
82
83
        self.addCleanup(base_tree.unlock)