/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

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
620
620
        public_branch=None, message=None, base_revision_id=None):
621
621
        include_patch = (patch_type in ('bundle', 'diff'))
622
622
        include_bundle = (patch_type == 'bundle')
623
 
        assert patch_type in ('bundle', 'diff', None)
 
623
        self.assertTrue(patch_type in ('bundle', 'diff', None))
624
624
        return merge_directive.MergeDirective2.from_objects(
625
625
            repository, revision_id, time, timezone, target_branch,
626
626
            include_patch, include_bundle, local_target_branch, public_branch,