~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/errors.py

Committer: Patch Queue Manager
Date: 2012-01-27 20:46:27 UTC
mfrom: (6437.18.5 colo-branch-names-with-slashes)
mto: (6437.24.1 2.5.0-dev) (6159.2.5 bzr) (6450.1.1 bzr.dev) (6457.1.1 trunk) (6461.1.1 trunk) (6468.1.1 merge-2.5) (6093.4.72 translations) (6472.1.1 merge-2.5) (6474.1.1 trunk) (6476.1.1 dev_2.5_integration) (6492.1.1 trunk) (6498.1.1 trunk) (6507.1.1 trunk) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6451.
Revision ID: pqm@pqm.ubuntu.com-20120127204627-l1k18d3chedgs3bu

(jelmer) Support forward slashes in colocated branch names. (Jelmer Vernooij)

added added

removed removed

710

_fmt = 'Already a branch: "%(path)s".'

711

712

713

class ParentBranchExists(AlreadyBranchError):

714

715

_fmt = 'Parent branch already exists: "%(path)s".'

716

717

713

718

class BranchExistsWithoutWorkingTree(PathError):

714

719

715

720

_fmt = 'Directory contains a branch, but no working tree \