/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_workingtree/test_pull.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:17:06 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610001706-xn6jiuev350246mr
Rename a number of attributes from bzrdir to controldir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_pull.py
63
63
        self.build_tree(['from/file'])
64
64
        tree.add(['file'])
65
65
        tree.commit('first')
66
 
        to_tree = tree.bzrdir.sprout('to').open_workingtree()
 
66
        to_tree = tree.controldir.sprout('to').open_workingtree()
67
67
        self.assertEqual('first_root_id', to_tree.get_root_id())
68
68
        tree.set_root_id('second_root_id')
69
69
        tree.commit('second')
96
96
                '%r does not support missing parent conflicts' %
97
97
                    self.workingtree_format)
98
98
        trunk = self.make_branch_deleting_dir('trunk')
99
 
        work = trunk.bzrdir.sprout('work', revision_id='2').open_workingtree()
 
99
        work = trunk.controldir.sprout('work', revision_id='2').open_workingtree()
100
100
        work.branch.get_config_stack().set(
101
101
            'bzr.transform.orphan_policy', 'move')
102
102
        # Add some unversioned files in dir