/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/remote.py

  • Committer: John Arbash Meinel
  • Date: 2009-09-02 13:32:52 UTC
  • mfrom: (4634.6.14 2.0)
  • mto: (4634.6.15 2.0)
  • mto: This revision was merged to the branch mainline in revision 4667.
  • Revision ID: john@arbash-meinel.com-20090902133252-t2t94xtckoliv2th
Merge lp:bzr/2.0 to resolve NEWS issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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])