← 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: 2007-03-01 01:22:34 UTC
  • mto: (2018.5.81 hpss)
  • mto: This revision was merged to the branch mainline in revision 2435.
  • Revision ID: andrew.bennetts@canonical.com-20070301012234-pl8k56r5ui0orfxg
All branch_implementations/test_locking tests passing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
715
715
            mode = self._lock_mode
716
716
            self._lock_mode = None
717
717
            if self._real_branch is not None:
 
718
                if not self._leave_lock:
 
719
                    # If this RemoteBranch will remove the physical lock for the
 
720
                    # repository, make sure the _real_branch doesn't do it
 
721
                    # first.  (Because the _real_branch's repository is set to
 
722
                    # be the RemoteRepository.)
 
723
                    self._real_branch.repository.leave_lock_in_place()
718
724
                self._real_branch.unlock()
719
725
            if mode != 'w':
720
726
                return