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

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 05:10:44 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7294.
  • Revision ID: jelmer@jelmer.uk-20190304051044-vph4s8p9qvpy2qe9
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/upstream_import.py
28
28
import tarfile
29
29
import zipfile
30
30
 
31
 
from . import generate_ids, urlutils
 
31
from . import urlutils
 
32
from .bzr import generate_ids
32
33
from .controldir import ControlDir, is_control_filename
33
34
from .errors import (BzrError, NoSuchFile, BzrCommandError, NotBranchError)
34
35
from .osutils import (pathjoin, isdir, file_iterator, basename,