← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_branch.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_branch.py
57
57
 
58
58
    def test_create_tree_with_merge(self):
59
59
        tree = self.create_tree_with_merge()
60
 
        ancestry_graph = tree.branch.repository.get_revision_graph('rev-3')
61
 
        self.assertEqual({'rev-1':(),
 
60
        tree.lock_read()
 
61
        self.addCleanup(tree.unlock)
 
62
        graph = tree.branch.repository.get_graph()
 
63
        ancestry_graph = graph.get_parent_map(tree.branch.repository.all_revision_ids())
 
64
        self.assertEqual({'rev-1':('null:',),
62
65
                          'rev-2':('rev-1', ),
63
66
                          'rev-1.1.1':('rev-1', ),
64
67
                          'rev-3':('rev-2', 'rev-1.1.1', ),