← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Martin Pool
  • Date: 2009-08-28 05:00:33 UTC
  • mfrom: (4659 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4660.
  • Revision ID: mbp@sourcefrog.net-20090828050033-blwvnig3gdzbr1iw
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
2759
2759
                    'Missing key %r in context %r', key_err.args[0], context)
2760
2760
                raise err
2761
2761
 
2762
 
    if err.error_verb == 'NoSuchRevision':
 
2762
    if err.error_verb == 'IncompatibleRepositories':
 
2763
        raise errors.IncompatibleRepositories(err.error_args[0],
 
2764
            err.error_args[1], err.error_args[2])
 
2765
    elif err.error_verb == 'NoSuchRevision':
2763
2766
        raise NoSuchRevision(find('branch'), err.error_args[0])
2764
2767
    elif err.error_verb == 'nosuchrevision':
2765
2768
        raise NoSuchRevision(find('repository'), err.error_args[0])