/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: John Arbash Meinel
  • Date: 2007-11-16 01:39:55 UTC
  • mfrom: (2998 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3003.
  • Revision ID: john@arbash-meinel.com-20071116013955-3zy651u2crhk31xx
[merge] bzr.dev 2998

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_pull.py
23
23
from bzrlib import errors
24
24
from bzrlib.memorytree import MemoryTree
25
25
from bzrlib.revision import NULL_REVISION
26
 
from bzrlib.tests import TestSkipped
27
26
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
28
27
 
29
28
 
89
88
        tree_a.commit('message 2', rev_id='rev2a')
90
89
        tree_b.commit('message 2', rev_id='rev2b')
91
90
        self.assertRaises(errors.DivergedBranches, tree_a.pull, tree_b.branch)
92
 
        tree_a.branch.pull(tree_a.branch, overwrite=True,
 
91
        tree_a.branch.pull(tree_b.branch, overwrite=True,
93
92
                           stop_revision='rev2b')
94
93
        self.assertEqual('rev2b', tree_a.branch.last_revision())
95
94
        self.assertEqual(tree_b.branch.revision_history(),