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

  • Committer: Jelmer Vernooij
  • Date: 2018-04-02 00:52:27 UTC
  • mfrom: (6939 work)
  • mto: This revision was merged to the branch mainline in revision 7274.
  • Revision ID: jelmer@jelmer.uk-20180402005227-pecflp1mvdjrjqd6
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/foreign.py
25
25
from .commands import Command, Option
26
26
from .repository import Repository
27
27
from .revision import Revision
 
28
from .sixish import (
 
29
    text_type,
 
30
    )
28
31
from .lazy_import import lazy_import
29
32
lazy_import(globals(), """
30
33
from breezy import (
272
275
               help='Branch to push from, '
273
276
               'rather than the one containing the working directory.',
274
277
               short_name='d',
275
 
               type=unicode,
 
278
               type=text_type,
276
279
               ),
277
280
        Option('no-rebase', help="Do not rebase after push."),
278
281
        Option('strict',