← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

(mbp) stop using failIf, failUnless, etc (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
101
101
        # Merging a branch pulls its revision into the tree
102
102
        b = branch.Branch.open('../b')
103
103
        b_tip = b.last_revision()
104
 
        self.failUnless(a.branch.repository.has_revision(b_tip))
 
104
        self.assertTrue(a.branch.repository.has_revision(b_tip))
105
105
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
106
106
        a_tree.revert(backups=False)
107
107
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)