← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-19 19:43:21 UTC
  • mfrom: (1551.15.29 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070619194321-g3qy7rh361kdvstd
Make merge directives robust against broken bundles

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
108
108
            patch = ''.join(patch_lines)
109
109
            try:
110
110
                bundle_serializer.read_bundle(StringIO(patch))
111
 
            except errors.NotABundle:
 
111
            except (errors.NotABundle, errors.BundleNotSupported,
 
112
                    errors.BadBundle):
112
113
                patch_type = 'diff'
113
114
            else:
114
115
                patch_type = 'bundle'