← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Andrew Bennetts
  • Date: 2008-07-25 06:42:08 UTC
  • mto: This revision was merged to the branch mainline in revision 3581.
  • Revision ID: andrew.bennetts@canonical.com-20080725064208-ui70gluukdypd4y9
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.

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