/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 bzrlib/errors.py

  • Committer: Aaron Bentley
  • Date: 2007-02-11 20:19:25 UTC
  • mto: (2230.3.47 branch6)
  • mto: This revision was merged to the branch mainline in revision 2290.
  • Revision ID: aaron.bentley@utoronto.ca-20070211201925-k72id2073qhbor31
Implement strict history policy

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
803
803
    _fmt = "%(branch)s is missing %(object_type)s {%(object_id)s}"
804
804
 
805
805
 
 
806
class StrictHistoryViolation(BzrError):
 
807
 
 
808
    _fmt = """Applying operation would alter current history"""
 
809
 
 
810
 
806
811
class DivergedBranches(BzrError):
807
812
    
808
813
    _fmt = "These branches have diverged.  Use the merge command to reconcile them."""