/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: Canonical.com Patch Queue Manager
  • Date: 2007-11-09 15:41:45 UTC
  • mfrom: (2975.1.1 foreign-format)
  • Revision ID: pqm@pqm.ubuntu.com-20071109154145-1yq4oi390uk3z90o
(robertc) Minor fixes for foreign format friendliness. (Robert Collins)

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(),