← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
273
273
        """
274
274
        _BaseMergeDirective.__init__(self, revision_id, testament_sha1, time,
275
275
            timezone, target_branch, patch, source_branch, message)
276
 
        assert patch_type in (None, 'diff', 'bundle'), patch_type
 
276
        if patch_type not in (None, 'diff', 'bundle'):
 
277
            raise ValueError(patch_type)
277
278
        if patch_type != 'bundle' and source_branch is None:
278
279
            raise errors.NoMergeSource()
279
280
        if patch_type is not None and patch is None: