← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_executable.py

(robertc) Deprecate WorkingTree.pending_merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_executable.py
75
75
        # TODO: Maybe this should be a blackbox test
76
76
        dir2 = self.wt.branch.bzrdir.clone('b2', revision_id='r1')
77
77
        wt2 = dir2.open_workingtree()
78
 
        self.assertEqual('r1', wt2.last_revision())
 
78
        self.assertEqual(['r1'], wt2.get_parent_ids())
79
79
        self.assertEqual('r1', wt2.branch.last_revision())
80
80
        return wt2
81
81
 
149
149
 
150
150
        # Make sure pull will delete the files
151
151
        wt2.pull(self.wt.branch)
152
 
        self.assertEquals('r2', wt2.last_revision())
 
152
        self.assertEquals(['r2'], wt2.get_parent_ids())
153
153
        self.assertEquals('r2', wt2.branch.last_revision())
154
154
        self.check_empty(wt2)
155
155
 
163
163
        self.check_exist(self.wt)
164
164
 
165
165
        wt2.pull(self.wt.branch)
166
 
        self.assertEquals('r3', wt2.last_revision())
 
166
        self.assertEquals(['r3'], wt2.get_parent_ids())
167
167
        self.assertEquals('r3', wt2.branch.last_revision())
168
168
        self.check_exist(wt2)
169
169