/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/blackbox/test_commit.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/blackbox/test_commit.py
91
91
        a_tree.add('a_file')
92
92
        self.run_bzr(['commit', '-m', 'first commit', 'a'])
93
93
 
94
 
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
94
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
95
95
        self.build_tree_contents([('b/a_file', 'changes in b')])
96
96
        self.run_bzr(['commit', '-m', 'first commit in b', 'b'])
97
97
 
307
307
            'filetoleave']
308
308
            )
309
309
        this_tree.commit('create_files')
310
 
        other_dir = this_tree.bzrdir.sprout('other')
 
310
        other_dir = this_tree.controldir.sprout('other')
311
311
        other_tree = other_dir.open_workingtree()
312
312
        other_tree.lock_write()
313
313
        # perform the needed actions on the files and dirs.