/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Daniel Watkins
  • Date: 2007-11-13 02:10:22 UTC
  • mfrom: (2981 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2983.
  • Revision ID: d.m.watkins@warwick.ac.uk-20071113021022-1u3x2k4q4kh1pxh5
Merged bzr.dev and moved NEWS item to appropriate location.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_pull.py
88
88
        tree_a.commit('message 2', rev_id='rev2a')
89
89
        tree_b.commit('message 2', rev_id='rev2b')
90
90
        self.assertRaises(errors.DivergedBranches, tree_a.pull, tree_b.branch)
91
 
        tree_a.branch.pull(tree_a.branch, overwrite=True,
 
91
        tree_a.branch.pull(tree_b.branch, overwrite=True,
92
92
                           stop_revision='rev2b')
93
93
        self.assertEqual('rev2b', tree_a.branch.last_revision())
94
94
        self.assertEqual(tree_b.branch.revision_history(),