← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: John Arbash Meinel
  • Date: 2005-12-31 00:51:34 UTC
  • mto: (1587.1.6 bound-branches)
  • mto: This revision was merged to the branch mainline in revision 1590.
  • Revision ID: john@arbash-meinel.com-20051231005134-dd54e393c7d3b612
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
360
360
        self.master = master
361
361
        self.remote = remote
362
362
 
 
363
 
 
364
class OverwriteBoundBranch(BzrNewError):
 
365
    """Cannot pull --overwrite to a branch which is bound %(branch)s"""
 
366
    def __init__(self, branch):
 
367
        BzrNewError.__init__(self)
 
368
        self.branch = branch
 
369
 
363
370
        
364
371
class WeaveError(BzrNewError):
365
372
    """Error in processing weave: %(message)s"""