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

  • Committer: Jelmer Vernooij
  • Date: 2018-02-18 19:34:37 UTC
  • mfrom: (6857.1.1 fix-import-stacked)
  • Revision ID: jelmer@jelmer.uk-20180218193437-pytr0vyldq867owo
Merge lp:~jelmer/brz/fix-import-stacked.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
30
30
 
31
31
import breezy
32
32
from breezy import (
 
33
    branch as _mod_branch,
33
34
    bugtracker,
34
35
    bundle,
35
36
    cache_utf8,
60
61
from breezy.bzr import (
61
62
    btree_index,
62
63
    )
63
 
from breezy.branch import Branch, UnstackableBranchFormat
 
64
from breezy.branch import Branch
64
65
from breezy.conflicts import ConflictList
65
66
from breezy.transport import memory
66
67
from breezy.smtp_connection import SMTPConnection
1601
1602
        try:
1602
1603
            note(gettext('Created new stacked branch referring to %s.') %
1603
1604
                branch.get_stacked_on_url())
1604
 
        except (errors.NotStacked, UnstackableBranchFormat,
 
1605
        except (errors.NotStacked, _mod_branch.UnstackableBranchFormat,
1605
1606
            errors.UnstackableRepositoryFormat) as e:
1606
1607
            note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1607
1608
        if bind: