~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Robert Collins
  • Date: 2009-05-01 06:36:12 UTC
  • mto: This revision was merged to the branch mainline in revision 4319.
  • Revision ID: robertc@robertcollins.net-20090501063612-1898qo17eimybm7w
Handle repositories that mutex on writes (rather than transactions).

Show diffs side-by-side

added added

removed removed

Lines of Context:
3173
3173
                # Updated server verb that locks remotely.
3174
3174
                repo_lock_token = response[10] or None
3175
3175
                remote_repo.lock_write(repo_lock_token, _skip_rpc=True)
 
3176
                if repo_lock_token:
 
3177
                    remote_repo.dont_leave_lock_in_place()
3176
3178
            else:
3177
 
                remore_repo.lock_write()
 
3179
                remote_repo.lock_write()
3178
3180
            policy = UseExistingRepository(remote_repo, final_stack,
3179
3181
                final_stack_pwd, require_stacking)
3180
3182
            policy.acquire_repository()