← 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-09-05 10:25:40 UTC
  • mto: This revision was merged to the branch mainline in revision 3693.
  • Revision ID: andrew.bennetts@canonical.com-20080905102540-118qgqvl1a6nt019
Fix bug revealed by removing _ensure_real call from RemoteBranch.lock_write.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1416
1416
                self._repo_lock_token, _skip_rpc=True)
1417
1417
 
1418
1418
            if self._real_branch is not None:
1419
 
                    self._real_branch.lock_write(token=self._lock_token)
 
1419
                self._real_branch.lock_write(token=self._lock_token)
1420
1420
            if token is not None:
1421
1421
                self._leave_lock = True
1422
1422
            else:
1528
1528
            raise errors.UnexpectedSmartServerResponse(response)
1529
1529
        new_revno, new_revision_id = response[1:]
1530
1530
        self._last_revision_info_cache = new_revno, new_revision_id
1531
 
        self._real_branch._last_revision_info_cache = new_revno, new_revision_id
 
1531
        if self._real_branch is not None:
 
1532
            cache = new_revno, new_revision_id
 
1533
            self._real_branch._last_revision_info_cache = cache
1532
1534
 
1533
1535
    def _set_last_revision(self, revision_id):
1534
1536
        path = self.bzrdir._path_for_remote_call(self._client)