~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-04-01 05:11:40 UTC
  • mfrom: (1551.14.13 mergedirective)
  • Revision ID: pqm@pqm.ubuntu.com-20070401051140-280aed4369df0386
merge and pull support merge directives

Show diffs side-by-side

added added

removed removed

Lines of Context:
884
884
        tree = bundle.revision_tree(self.b1.repository, 'revid1')
885
885
        self.assertEqual('revid1', tree.inventory.root.revision)
886
886
 
 
887
    def test_install_revisions(self):
 
888
        self.tree1 = self.make_branch_and_tree('b1')
 
889
        self.b1 = self.tree1.branch
 
890
        self.tree1.commit('message', rev_id='rev2a')
 
891
        bundle = self.get_valid_bundle(None, 'rev2a')
 
892
        branch2 = self.make_branch('b2')
 
893
        self.assertFalse(branch2.repository.has_revision('rev2a'))
 
894
        target_revision = bundle.install_revisions(branch2.repository)
 
895
        self.assertTrue(branch2.repository.has_revision('rev2a'))
 
896
        self.assertEqual('rev2a', target_revision)
 
897
 
887
898
 
888
899
class V09BundleKnit2Tester(V08BundleTester):
889
900