← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_repository.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-11-11 08:45:19 UTC
  • mfrom: (4597.9.22 reports-conflict-resolved)
  • Revision ID: pqm@pqm.ubuntu.com-20101111084519-bmk1zmblp7kex41a
(vila) More feedback about the conflicts just resolved and the remaining
 ones. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_repository.py
586
586
                                ]
587
587
        repo_a = self.make_repository('a')
588
588
        repo_b = self.make_repository('b')
589
 
        is_compatible = weaverepo.InterWeaveRepo.is_compatible
 
589
        is_compatible = repository.InterWeaveRepo.is_compatible
590
590
        for source in incompatible_formats:
591
591
            # force incompatible left then right
592
592
            repo_a._format = source
598
598
            for target in formats:
599
599
                repo_b._format = target
600
600
                self.assertTrue(is_compatible(repo_a, repo_b))
601
 
        self.assertEqual(weaverepo.InterWeaveRepo,
 
601
        self.assertEqual(repository.InterWeaveRepo,
602
602
                         repository.InterRepository.get(repo_a,
603
603
                                                        repo_b).__class__)
604
604
 
972
972
 
973
973
    def setUp(self):
974
974
        super(TestDevelopment6FindParentIdsOfRevisions, self).setUp()
975
 
        self.builder = self.make_branch_builder('source')
 
975
        self.builder = self.make_branch_builder('source',
 
976
            format='development6-rich-root')
976
977
        self.builder.start_series()
977
978
        self.builder.build_snapshot('initial', None,
978
979
            [('add', ('', 'tree-root', 'directory', None))])