/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/per_branch/test_update.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/per_branch/test_update.py
80
80
            raise tests.TestNotApplicable("only triggered from branches with"
81
81
                " tags")
82
82
        readonly_branch1 = branch.Branch.open('readonly+' + tree1.branch.base)
83
 
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
 
83
        tree2 = tree1.controldir.sprout('tree2').open_workingtree()
84
84
        try:
85
85
            tree2.branch.bind(readonly_branch1)
86
86
        except errors.UpgradeRequired: