← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/repository.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/repository.py
392
392
        if token == '':
393
393
            token = None
394
394
        try:
395
 
            token = repository.lock_write(token=token)
 
395
            token = repository.lock_write(token=token).repository_token
396
396
        except errors.LockContention, e:
397
397
            return FailedSmartServerResponse(('LockContention',))
398
398
        except errors.UnlockableTransport: