← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/repository_implementations/test_reconcile.py

  • Committer: Aaron Bentley
  • Date: 2007-08-26 22:29:28 UTC
  • mto: This revision was merged to the branch mainline in revision 2905.
  • Revision ID: aaron.bentley@utoronto.ca-20070826222928-xex3vixfmuto3ule
Misc cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/repository_implementations/test_reconcile.py
22
22
from bzrlib.inventory import Inventory, InventoryFile
23
23
from bzrlib.reconcile import reconcile, Reconciler
24
24
from bzrlib.revision import Revision
 
25
from bzrlib.repofmt.knitrepo import KnitRepository
25
26
from bzrlib.tests import TestSkipped
26
27
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
27
28
from bzrlib.transport import get_transport
465
466
 
466
467
    def test_reconcile_text_parents(self):
467
468
        repo = self.make_broken_repository()
 
469
        if not isinstance(repo, KnitRepository):
 
470
            raise TestSkipped("Format does not support text parent"
 
471
                              " reconciliation")
468
472
        vf = repo.weave_store.get_weave('file2-id', repo.get_transaction())
469
473
        bad_ancestors = repo.find_bad_ancestors(['rev1a', 'rev2', 'rev3'],
470
474
                                                'file2-id', vf, {})
472
476
        vf = repo.weave_store.get_weave('file3-id', repo.get_transaction())
473
477
        self.assertEqual(['rev2'], vf.get_parents('rev3'))
474
478
        self.assertNotEqual({}, bad_ancestors)
475
 
        repo.reconcile()
 
479
        repo.reconcile(thorough=True)
476
480
        vf = repo.weave_store.get_weave('file2-id', repo.get_transaction())
477
481
        revision_versions = {}
478
482
        bad_ancestors = repo.find_bad_ancestors(['rev1a', 'rev2', 'rev3'],