/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/bundle/__init__.py

  • Committer: Robert Collins
  • Date: 2009-07-22 00:34:44 UTC
  • mfrom: (4555 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4557.
  • Revision ID: robertc@robertcollins.net-20090722003444-vcci9yub1ypc5n6k
Fix NEWS conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
70
70
            f, transport = do_catching_redirections(get_bundle, transport,
71
71
                                                    redirected_transport)
72
72
        except errors.TooManyRedirections:
73
 
            raise errors.NotABundle(str(url))
 
73
            raise errors.NotABundle(transport.clone(filename).base)
74
74
 
75
75
        if _do_directive:
76
76
            from bzrlib.merge_directive import MergeDirective