/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/lockdir.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-15 20:04:37 UTC
  • mfrom: (4748 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4752.
  • Revision ID: john@arbash-meinel.com-20091015200437-4wweb0t6uzspvv84
Bring in bzr.dev 4748, resolve conflict, update NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
112
112
    lock,
113
113
    )
114
114
import bzrlib.config
 
115
from bzrlib.decorators import only_raises
115
116
from bzrlib.errors import (
116
117
        DirectoryNotEmpty,
117
118
        FileExists,
286
287
                                            info_bytes)
287
288
        return tmpname
288
289
 
 
290
    @only_raises(LockNotHeld, LockBroken)
289
291
    def unlock(self):
290
292
        """Release a held lock
291
293
        """