/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_revision_tree.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_revision_tree.py
52
52
    def test_get_pending_merge_revision_tree(self):
53
53
        tree = self.make_branch_and_tree('tree1')
54
54
        tree.commit('first post')
55
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
55
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
56
56
        revision1 = tree2.commit('commit in branch', allow_pointless=True)
57
57
        tree.merge_from_branch(tree2.branch)
58
58
        try:
94
94
        tree = self.make_branch_and_tree(relpath)
95
95
        files = ['a', 'b/', 'b/c']
96
96
        self.build_tree(files, line_endings='binary',
97
 
                        transport=tree.bzrdir.root_transport)
 
97
                        transport=tree.controldir.root_transport)
98
98
        tree.set_root_id('root-id')
99
99
        tree.add(files, ['a-id', 'b-id', 'c-id'])
100
100
        tree.commit('a, b and b/c', rev_id='base')
101
 
        tree2 = tree.bzrdir.sprout(relpath + '2').open_workingtree()
 
101
        tree2 = tree.controldir.sprout(relpath + '2').open_workingtree()
102
102
        # Delete 'a' in tree
103
103
        tree.remove('a', keep_files=False)
104
104
        tree.commit('remove a', rev_id='this')