/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/test_merge_directive.py

  • Committer: Aaron Bentley
  • Date: 2007-04-01 03:52:31 UTC
  • mto: This revision was merged to the branch mainline in revision 2389.
  • Revision ID: aaron.bentley@utoronto.ca-20070401035231-w87zy7hrpre4v81m
rename get_target_revision to install_revisions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
292
292
        message = md.to_email('pqm@example.com', tree_a.branch)
293
293
        self.assertContainsRe(message.as_string(), EMAIL2)
294
294
 
295
 
    def test_get_target_revision_branch(self):
 
295
    def test_install_revisions_branch(self):
296
296
        tree_a, tree_b, branch_c = self.make_trees()
297
297
        md = merge_directive.MergeDirective.from_objects(
298
298
            tree_a.branch.repository, 'rev2a', 500, 36, tree_b.branch.base,
299
299
            patch_type=None, public_branch=tree_a.branch.base)
300
300
        self.assertFalse(tree_b.branch.repository.has_revision('rev2a'))
301
 
        revision = md.get_target_revision(tree_b.branch.repository)
 
301
        revision = md.install_revisions(tree_b.branch.repository)
302
302
        self.assertEqual('rev2a', revision)
303
303
        self.assertTrue(tree_b.branch.repository.has_revision('rev2a'))
304
304
 
305
 
    def test_get_target_revision_bundle(self):
 
305
    def test_install_revisions_bundle(self):
306
306
        tree_a, tree_b, branch_c = self.make_trees()
307
307
        md = merge_directive.MergeDirective.from_objects(
308
308
            tree_a.branch.repository, 'rev2a', 500, 36, tree_b.branch.base,
309
309
            patch_type='bundle', public_branch=tree_a.branch.base)
310
310
        self.assertFalse(tree_b.branch.repository.has_revision('rev2a'))
311
 
        revision = md.get_target_revision(tree_b.branch.repository)
 
311
        revision = md.install_revisions(tree_b.branch.repository)
312
312
        self.assertEqual('rev2a', revision)
313
313
        self.assertTrue(tree_b.branch.repository.has_revision('rev2a'))
314
314
 
319
319
            tree_a.branch.repository, 'rev2a', 500, 36, tree_b.branch.base,
320
320
            patch_type=None, public_branch=tree_a.branch.base)
321
321
        md.source_branch = '/dev/null'
322
 
        revision = md.get_target_revision(tree_b.branch.repository)
 
322
        revision = md.install_revisions(tree_b.branch.repository)
323
323
        self.assertEqual('rev2a', revision)