← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_status.py

Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
81
81
        # add a commit to allow showing pending merges.
82
82
        wt.commit('create a parent to allow testing merge output')
83
83
 
84
 
        wt.add_pending_merge('pending@pending-0-0')
 
84
        wt.add_parent_tree_id('pending@pending-0-0')
85
85
        self.assertStatus([
86
86
                'unknown:\n',
87
87
                '  bye.c\n',