/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: 2007-02-09 07:16:20 UTC
  • mfrom: (2272 +trunk)
  • mto: (2255.6.1 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20070209071620-gp2n7vtjyb0f2x1e
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lockdir.py
220
220
            self.transport.rename(tmpname, self._held_dir)
221
221
            self._lock_held = True
222
222
            self.confirm()
 
223
        except errors.PermissionDenied:
 
224
            raise
223
225
        except (PathError, DirectoryNotEmpty, FileExists, ResourceBusy), e:
224
226
            mutter("contention on %r: %s", self, e)
225
227
            raise LockContention(self)