/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: 2017-07-30 23:53:38 UTC
  • mfrom: (6734.1.22 move-errors-more)
  • Revision ID: jelmer@jelmer.uk-20170730235338-25jy0lgifkyx796l
Merge lp:~jelmer/brz/move-errors-more.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
60
60
from breezy.bzr import (
61
61
    btree_index,
62
62
    )
63
 
from breezy.branch import Branch
 
63
from breezy.branch import Branch, UnstackableBranchFormat
64
64
from breezy.conflicts import ConflictList
65
65
from breezy.transport import memory
66
66
from breezy.revisionspec import RevisionSpec, RevisionInfo
1524
1524
        try:
1525
1525
            note(gettext('Created new stacked branch referring to %s.') %
1526
1526
                branch.get_stacked_on_url())
1527
 
        except (errors.NotStacked, errors.UnstackableBranchFormat,
 
1527
        except (errors.NotStacked, UnstackableBranchFormat,
1528
1528
            errors.UnstackableRepositoryFormat) as e:
1529
1529
            note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
1530
1530
        if bind:
3559
3559
            unchanged=False, strict=False, local=False, fixes=None,
3560
3560
            author=None, show_diff=False, exclude=None, commit_time=None,
3561
3561
            lossy=False):
 
3562
        from .commit import (
 
3563
            PointlessCommit,
 
3564
            )
3562
3565
        from .errors import (
3563
 
            PointlessCommit,
3564
3566
            ConflictsInTree,
3565
3567
            StrictCommitFailed
3566
3568
        )