~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_check_reconcile.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
from bzrlib.inventory import Inventory, InventoryFile
26
26
from bzrlib.revision import Revision
27
27
from bzrlib.tests import TestNotApplicable
28
 
from bzrlib.tests.repository_implementations import TestCaseWithRepository
 
28
from bzrlib.tests.per_repository import TestCaseWithRepository
29
29
 
30
30
 
31
31
class TestFileParentReconciliation(TestCaseWithRepository):