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

Merge bzr.dev and resolve conflits. (good use case for an enhanced merge
algorithm, many conflits should at least be presented in a better way).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/remote.py
143
143
            return False
144
144
        else:
145
145
            self._translate_error(resp)
146
 
        assert False, 'weird response %r' % (resp,)
 
146
        raise errors.UnexpectedSmartServerResponse(resp)
147
147
 
148
148
    def get_smart_client(self):
149
149
        return self._medium