← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

Merge smart server changes that are already with PQM, and fix conflict and formatting nit in NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
53
53
            self._medium = None
54
54
            return
55
55
 
56
 
        self._ensure_real()
57
56
        path = self._path_for_remote_call(self._client)
58
57
        response = self._client.call('BzrDir.open', path)
59
58
        if response not in [('yes',), ('no',)]:
901
900
            rev_id = 'null:'
902
901
        else:
903
902
            rev_id = rev_history[-1]
 
903
        self._clear_cached_state()
904
904
        response = self._client.call('Branch.set_last_revision',
905
905
            path, self._lock_token, self._repo_lock_token, rev_id)
906
906
        if response[0] == 'NoSuchRevision':