← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.py

Remove usage of tree.pending_merges().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
30
30
        tree.commit('empty commit')
31
31
        tree2 = self.make_branch_and_tree('b')
32
32
        # set a left most parent
33
 
        tree2.add_parent_id('some-ghost', allow_leftmost_as_ghost=True)
 
33
        tree2.add_parent_tree_id('some-ghost', allow_leftmost_as_ghost=True)
34
34
        # do a merge
35
35
        self.merge(tree.branch, tree2)
36
36
        output = StringIO()