/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-10 18:39:27 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • Revision ID: breezy.the.bot@gmail.com-20170610183927-8yn4wmsk1ki92xc3
Rename ``bzrdir`` attribute to ``controldir``.

Merged from https://code.launchpad.net/~jelmer/brz/rename-controldir/+merge/325433

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.