/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/tests/per_branch/test_locking.py

  • Committer: Ian Clatworthy
  • Date: 2009-07-13 06:04:28 UTC
  • mfrom: (4527 +trunk)
  • mto: (4527.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4529.
  • Revision ID: ian.clatworthy@canonical.com-20090713060428-5m6apiywie6aqg6v
merge bzr.dev r4527

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):