/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/mergeable.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/mergeable.py
19
19
from .lazy_import import lazy_import
20
20
lazy_import(globals(), """
21
21
from breezy import (
 
22
    errors,
22
23
    transport as _mod_transport,
23
24
    urlutils,
24
25
    )
25
 
from breezy.bzr.bundle import serializer as _serializer
 
26
from breezy.bundle import serializer as _serializer
26
27
from breezy.merge_directive import MergeDirective
27
28
from breezy.i18n import gettext
28
29
""")
29
30
 
30
 
from . import (
31
 
    errors,
32
 
    )
33
31
from .sixish import (
34
32
    BytesIO,
35
33
    )