← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-25 15:19:45 UTC
  • mfrom: (3577.1.3 tip-change-rejected-error)
  • Revision ID: pqm@pqm.ubuntu.com-20080725151945-kdaru30ix1m8k0h6
Add TipChangeRejected error so that pre_change_branch_tip hook
        functions can cleanly reject a change. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1696
1696
        raise errors.TokenMismatch(find('token'), '(remote token)')
1697
1697
    elif err.error_verb == 'Diverged':
1698
1698
        raise errors.DivergedBranches(find('branch'), find('other_branch'))
 
1699
    elif err.error_verb == 'TipChangeRejected':
 
1700
        raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
1699
1701
    raise
1700
1702