← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_controldir/test_controldir.py

  • Committer: Jelmer Vernooij
  • Date: 2011-09-12 09:51:52 UTC
  • mfrom: (6129 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6130.
  • Revision ID: jelmer@samba.org-20110912095152-04atttpiqgn2lzjw
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/test_controldir.py
462
462
        except errors.IncompatibleFormat:
463
463
            return
464
464
        target = dir.sprout(self.get_url('target/child'))
465
 
        self.assertNotEqual(dir.transport.base, target.transport.base)
 
465
        self.assertNotEqual(dir.user_transport.base, target.user_transport.base)
466
466
        self.assertTrue(shared_repo.has_revision('1'))
467
467
 
468
468
    def test_sprout_bzrdir_repository_branch_both_under_shared(self):
591
591
        except errors.IncompatibleFormat:
592
592
            return
593
593
        target = dir.sprout(self.get_url('target/child'), force_new_repo=True)
594
 
        self.assertNotEqual(dir.transport.base, target.transport.base)
 
594
        self.assertNotEqual(dir.control_transport.base, target.control_transport.base)
595
595
        self.assertFalse(shared_repo.has_revision('1'))
596
596
 
597
597
    def test_sprout_bzrdir_branch_reference(self):