← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-07-29 21:35:05 UTC
  • mfrom: (4576 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4577.
  • Revision ID: john@arbash-meinel.com-20090729213505-tkqsvy1zfpocu75w
Merge bzr.dev 4576 in prep for NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_locking.py
20
20
from bzrlib.branch import BzrBranchFormat4
21
21
from bzrlib.bzrdir import RemoteBzrDirFormat
22
22
from bzrlib.tests import TestSkipped
23
 
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
24
23
from bzrlib.tests.lock_helpers import TestPreventLocking, LockWrapper
 
24
from bzrlib.tests.per_branch.test_branch import TestCaseWithBranch
25
25
 
26
26
 
27
27
class TestBranchLocking(TestCaseWithBranch):