← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.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/test_inv.py
434
434
        self.assertEqual(self.branch.revision_history(), ['A'])
435
435
        self.wt.commit('another add of file', rev_id='C')
436
436
        self.inv_C = self.branch.repository.get_inventory('C')
437
 
        self.wt.add_pending_merge('B')
 
437
        self.wt.add_parent_tree_id('B')
438
438
        self.wt.commit('merge in B', rev_id='D')
439
439
        self.inv_D = self.branch.repository.get_inventory('D')
440
440
        self.file_active = self.wt.inventory['fileid']