← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-31 15:43:17 UTC
  • mfrom: (6437.3.28 2.5)
  • mto: (6437.23.1 2.5)
  • mto: This revision was merged to the branch mainline in revision 6458.
  • Revision ID: jelmer@samba.org-20120131154317-y028tz0r9xesvn9p
Merge 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
710
710
    _fmt = 'Already a branch: "%(path)s".'
711
711
 
712
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 \