/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_conflicts.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_conflicts.py
34
34
    this_tree.add(prefix+'_other_file')
35
35
    this_tree.add(prefix+'dir')
36
36
    this_tree.commit(message="new")
37
 
    other_tree = this_tree.bzrdir.sprout(other_path).open_workingtree()
 
37
    other_tree = this_tree.controldir.sprout(other_path).open_workingtree()
38
38
    test.build_tree_contents([
39
39
        ('%s/%sfile' % (other_path, prefix), 'contentsb\n'),
40
40
        ('%s/%s_other_file' % (other_path, prefix), 'contentsb\n'),