/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/test_commit.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/test_commit.py
520
520
        bound_tree.add(['content_file'])
521
521
        bound_tree.commit(message='woo!')
522
522
 
523
 
        other_bzrdir = master_branch.bzrdir.sprout('other')
 
523
        other_bzrdir = master_branch.controldir.sprout('other')
524
524
        other_tree = other_bzrdir.open_workingtree()
525
525
 
526
526
        # do a commit to the other branch changing the content file so
567
567
            'filetoleave']
568
568
            )
569
569
        this_tree.commit('create_files')
570
 
        other_dir = this_tree.bzrdir.sprout('other')
 
570
        other_dir = this_tree.controldir.sprout('other')
571
571
        other_tree = other_dir.open_workingtree()
572
572
        other_tree.lock_write()
573
573
        # perform the needed actions on the files and dirs.