← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2011-09-25 23:58:12 UTC
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20110925235812-c35izhdesn8rg0l5
More fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_pull.py
39
39
    def test_pull_overwrites(self):
40
40
        tree_a, tree_b = self.get_pullable_trees()
41
41
        tree_b.commit('foo', rev_id='B')
42
 
        self.assertEqual(['B'], tree_b.branch.revision_history())
 
42
        self.assertEqual('B', tree_b.branch.last_revision())
43
43
        tree_b.pull(tree_a.branch, overwrite=True)
44
44
        self.assertTrue(tree_b.branch.repository.has_revision('A'))
45
45
        self.assertTrue(tree_b.branch.repository.has_revision('B'))