/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_directive.py

• browse files at revision 3514.4.43
• compare with another revision
• compare with revision 5200.1.2
• download diff
• download tarball
• view history from revision 3514.4.43

Show diffs side-by-side

added

removed

bzrlib/tests/test_merge_directive.py

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

 

579

590

 

580

591

class TestMergeDirective1Branch(tests.TestCaseWithTransport,

581

592

    TestMergeDirectiveBranch):

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0