~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_locking.py

  • Committer: Andrew Bennetts
  • Date: 2011-05-09 02:33:16 UTC
  • mfrom: (5838 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5839.
  • Revision ID: andrew.bennetts@canonical.com-20110509023316-v1n4di9dh5lx5icj
MergeĀ lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
from bzrlib import (
22
22
    branch,
23
23
    errors,
24
 
    lockdir,
25
24
    )
26
25
from bzrlib.tests import TestSkipped
27
26
from bzrlib.tests.matchers import *