← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

Merge down-thread (including bzr.dev)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
442
442
        self.assertEqual(parent_bzrdir.root_transport.base,
443
443
                         repo_policy._stack_on_pwd)
444
444
 
445
 
    def prepare_default_stacking(self, child_format='development1'):
 
445
    def prepare_default_stacking(self, child_format='1.6'):
446
446
        parent_bzrdir = self.make_bzrdir('.')
447
447
        child_branch = self.make_branch('child', format=child_format)
448
448
        parent_bzrdir.get_config().set_default_stack_on(child_branch.base)
507
507
        self.assertTrue(repo.supports_rich_root())
508
508
 
509
509
    def test_add_fallback_repo_handles_absolute_urls(self):
510
 
        stack_on = self.make_branch('stack_on', format='development1')
511
 
        repo = self.make_repository('repo', format='development1')
 
510
        stack_on = self.make_branch('stack_on', format='1.6')
 
511
        repo = self.make_repository('repo', format='1.6')
512
512
        policy = bzrdir.UseExistingRepository(repo, stack_on.base)
513
513
        policy._add_fallback(repo)
514
514
 
515
515
    def test_add_fallback_repo_handles_relative_urls(self):
516
 
        stack_on = self.make_branch('stack_on', format='development1')
517
 
        repo = self.make_repository('repo', format='development1')
 
516
        stack_on = self.make_branch('stack_on', format='1.6')
 
517
        repo = self.make_repository('repo', format='1.6')
518
518
        policy = bzrdir.UseExistingRepository(repo, '.', stack_on.base)
519
519
        policy._add_fallback(repo)
520
520
 
521
521
    def test_configure_relative_branch_stacking_url(self):
522
 
        stack_on = self.make_branch('stack_on', format='development1')
523
 
        stacked = self.make_branch('stack_on/stacked', format='development1')
 
522
        stack_on = self.make_branch('stack_on', format='1.6')
 
523
        stacked = self.make_branch('stack_on/stacked', format='1.6')
524
524
        policy = bzrdir.UseExistingRepository(stacked.repository,
525
525
            '.', stack_on.base)
526
526
        policy.configure_branch(stacked)
527
527
        self.assertEqual('..', stacked.get_stacked_on_url())
528
528
 
529
529
    def test_relative_branch_stacking_to_absolute(self):
530
 
        stack_on = self.make_branch('stack_on', format='development1')
531
 
        stacked = self.make_branch('stack_on/stacked', format='development1')
 
530
        stack_on = self.make_branch('stack_on', format='1.6')
 
531
        stacked = self.make_branch('stack_on/stacked', format='1.6')
532
532
        policy = bzrdir.UseExistingRepository(stacked.repository,
533
533
            '.', self.get_readonly_url('stack_on'))
534
534
        policy.configure_branch(stacked)