/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: Aaron Bentley
  • Date: 2006-06-21 21:35:06 UTC
  • mfrom: (1803 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1804.
  • Revision ID: abentley@panoramicfeedback.com-20060621213506-e58c1f9dc1a6d6d2
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
96
96
 
97
97
import os
98
98
import time
99
 
from warnings import warn
100
99
from StringIO import StringIO
101
100
 
102
101
import bzrlib.config
106
105
        LockBreakMismatch,
107
106
        LockBroken,
108
107
        LockContention,
109
 
        LockError,
110
108
        LockNotHeld,
111
109
        NoSuchFile,
112
110
        PathError,