/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/per_workingtree/test_merge_from_branch.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/per_workingtree/test_merge_from_branch.py
37
37
        """
38
38
        self.tree_from = self.make_branch_and_tree('from')
39
39
        self.first_rev = self.tree_from.commit('first post')
40
 
        self.tree_to = self.tree_from.bzrdir.sprout('to').open_workingtree()
 
40
        self.tree_to = self.tree_from.controldir.sprout('to').open_workingtree()
41
41
        self.second_rev = self.tree_from.commit('second rev', allow_pointless=True)
42
42
        self.to_second_rev = self.tree_to.commit('second rev', allow_pointless=True)
43
43
 
62
62
        self.build_tree_contents([('tree_a/file', 'text-a')])
63
63
        tree_a.add('file')
64
64
        tree_a.commit('added file')
65
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
65
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
66
66
        os.unlink('tree_a/file')
67
67
        tree_a.commit('deleted file')
68
68
        self.build_tree_contents([('tree_b/file', 'text-b')])
87
87
        self.build_tree_contents([('tree_a/file', 'text-a')])
88
88
        tree_a.add('file')
89
89
        tree_a.commit('added file', rev_id='rev_1')
90
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
90
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
91
91
        os.unlink('tree_a/file')
92
92
        tree_a.commit('deleted file')
93
93
        self.build_tree_contents([('tree_b/file', 'text-b')])
105
105
        self.build_tree_contents([('this/foo', 'foo')])
106
106
        this.add('foo', 'foo-id')
107
107
        this.commit('added foo')
108
 
        other = this.bzrdir.sprout('other').open_workingtree()
 
108
        other = this.controldir.sprout('other').open_workingtree()
109
109
        self.build_tree_contents([('other/foo', 'bar')])
110
110
        other.commit('content -> bar')
111
111
        self.build_tree_contents([('this/foo', 'baz')])