/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_upgrade_stacked.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
Merge rename-controldir branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_upgrade_stacked.py
66
66
        self.build_tree(['base/foo'])
67
67
        base.commit('base commit')
68
68
        # make another one stacked
69
 
        stacked = base.bzrdir.sprout('stacked', stacked=True)
 
69
        stacked = base.controldir.sprout('stacked', stacked=True)
70
70
        # this must really be stacked (or get_stacked_on_url raises an error)
71
71
        self.assertTrue(stacked.open_branch().get_stacked_on_url())
72
72
        # now we'll upgrade the underlying branch, then upgrade the stacked
73
73
        # branch, and this should still work.
74
 
        new_format = controldir.format_registry.make_bzrdir(
 
74
        new_format = controldir.format_registry.make_controldir(
75
75
            self.scenario_new_format)
76
76
        upgrade('base', new_format)
77
77
        # in some cases you'll get an error if the underlying model has