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

  • Committer: Martin
  • Date: 2018-11-16 19:09:31 UTC
  • mfrom: (7175 work)
  • mto: This revision was merged to the branch mainline in revision 7177.
  • Revision ID: gzlist@googlemail.com-20181116190931-rmh7pk2an1zuecby
Merge trunk to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/__init__.py
41
41
        the target is not a mergeable type.
42
42
    """
43
43
    child_transport = _mod_transport.get_transport(url,
44
 
        possible_transports=possible_transports)
 
44
                                                   possible_transports=possible_transports)
45
45
    transport = child_transport.clone('..')
46
46
    filename = transport.relpath(child_transport.base)
47
47
    mergeable, transport = read_mergeable_from_transport(transport, filename,