← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

(robertc) Deprecate WorkingTree.pending_merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_pull.py
41
41
        tree_a, tree_b = self.get_pullable_trees()
42
42
        tree_b.pull(tree_a.branch)
43
43
        self.failUnless(tree_b.branch.repository.has_revision('A'))
44
 
        self.assertEqual('A', tree_b.last_revision())
 
44
        self.assertEqual(['A'], tree_b.get_parent_ids())
45
45
 
46
46
    def test_pull_overwrites(self):
47
47
        tree_a, tree_b = self.get_pullable_trees()
50
50
        tree_b.pull(tree_a.branch, overwrite=True)
51
51
        self.failUnless(tree_b.branch.repository.has_revision('A'))
52
52
        self.failUnless(tree_b.branch.repository.has_revision('B'))
53
 
        self.assertEqual('A', tree_b.last_revision())
 
53
        self.assertEqual(['A'], tree_b.get_parent_ids())
54
54
 
55
55
    def test_pull_merges_tree_content(self):
56
56
        tree_a, tree_b = self.get_pullable_trees()