/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_merge.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_commit_merge.py
43
43
        wtx = self.make_branch_and_tree('x')
44
44
        base_rev = wtx.commit('common parent')
45
45
        bx = wtx.branch
46
 
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
46
        wty = wtx.controldir.sprout('y').open_workingtree()
47
47
        by = wty.branch
48
48
 
49
49
        wtx.commit('commit one', rev_id='x@u-0-1', allow_pointless=True)
74
74
        base_rev = wtx.commit('common parent')
75
75
        bx = wtx.branch
76
76
        wtx.commit('establish root id')
77
 
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
77
        wty = wtx.controldir.sprout('y').open_workingtree()
78
78
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
79
79
        by = wty.branch
80
80
 
110
110
        os.symlink('target', osutils.pathjoin('tree_a', 'link'))
111
111
        tree_a.add('link')
112
112
        tree_a.commit('added link')
113
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
113
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
114
114
        self.build_tree(['tree_a/file'])
115
115
        tree_a.add('file')
116
116
        tree_a.commit('added file')