← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

(robertc) Deprecate WorkingTree.pending_merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_checkout.py
58
58
        # the working tree should now be at revision '1' with the content
59
59
        # from 1.
60
60
        result = bzrdir.BzrDir.open('checkout')
61
 
        self.assertEqual('1', result.open_workingtree().last_revision())
 
61
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
62
62
        self.failIfExists('checkout/added_in_2')
63
63
 
64
64
    def test_checkout_light_dash_r(self):
66
66
        # the working tree should now be at revision '1' with the content
67
67
        # from 1.
68
68
        result = bzrdir.BzrDir.open('checkout')
69
 
        self.assertEqual('1', result.open_workingtree().last_revision())
 
69
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
70
70
        self.failIfExists('checkout/added_in_2')
71
71
 
72
72
    def test_checkout_reconstitutes_working_trees(self):