/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_merge_core.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/test_merge_core.py
463
463
        tree.commit("start branch.", verbose=False)
464
464
        # Mary branches it.
465
465
        self.build_tree(("mary/",))
466
 
        branch.bzrdir.clone("mary")
 
466
        branch.controldir.clone("mary")
467
467
        # Now John commits a change
468
468
        file = open("original/file1", "wt")
469
469
        file.write("John\n")
488
488
        self.build_tree_contents([('a/file', 'contents\n')])
489
489
        wta.add('file')
490
490
        wta.commit('base revision', allow_pointless=False)
491
 
        d_b = wta.branch.bzrdir.clone('b')
 
491
        d_b = wta.branch.controldir.clone('b')
492
492
        self.build_tree_contents([('a/file', 'other contents\n')])
493
493
        wta.commit('other revision', allow_pointless=False)
494
494
        self.build_tree_contents([('b/file', 'this contents contents\n')])
765
765
    def set_up_trees(self):
766
766
        this = self.make_branch_and_tree('this')
767
767
        this.commit('rev1', rev_id='rev1')
768
 
        other = this.bzrdir.sprout('other').open_workingtree()
 
768
        other = this.controldir.sprout('other').open_workingtree()
769
769
        this.commit('rev2a', rev_id='rev2a')
770
770
        other.commit('rev2b', rev_id='rev2b')
771
771
        return this, other