← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_directive.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-06-05 04:05:05 UTC
  • mfrom: (3473.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080605040505-i9kqxg2fps2qjdi0
Add the 'alias' command (Tim Penhey)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
374
374
 
375
375
    def test_disk_name(self):
376
376
        tree_a, tree_b, branch_c = self.make_trees()
377
 
        tree_a.branch.nick = 'fancy <name>'
 
377
        tree_a.branch.nick = 'fancy-name'
378
378
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
379
379
            tree_b.branch.base)
380
380
        self.assertEqual('fancy-name-2', md.get_disk_name(tree_a.branch))
576
576
            branch_c.base, base_revision_id='rev2a')
577
577
        revision = md.install_revisions(tree_b.branch.repository)
578
578
 
579
 
    def test_handle_target_not_a_branch(self):
580
 
        tree_a, tree_b, branch_c = self.make_trees()
581
 
        branch_c.pull(tree_a.branch)
582
 
        self.build_tree_contents([('tree_a/file', 'content_q\ncontent_r\n')])
583
 
        tree_a.commit('rev3a', rev_id='rev3a')
584
 
        md = self.from_objects(tree_a.branch.repository, 'rev3a', 500, 36,
585
 
            branch_c.base, base_revision_id='rev2a')
586
 
        md.target_branch = self.get_url('not-a-branch')
587
 
        self.assertRaises(errors.TargetNotBranch, md.install_revisions,
588
 
                tree_b.branch.repository)
589
 
 
590
579
 
591
580
class TestMergeDirective1Branch(tests.TestCaseWithTransport,
592
581
    TestMergeDirectiveBranch):