/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_directive.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_merge_directive.py
359
359
                                  ('tree_a/file_2', 'content_x\rcontent_y\r')])
360
360
        tree_a.add(['file', 'file_2'])
361
361
        tree_a.commit('message', rev_id='rev1')
362
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
363
 
        branch_c = tree_a.bzrdir.sprout('branch_c').open_branch()
 
362
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
 
363
        branch_c = tree_a.controldir.sprout('branch_c').open_branch()
364
364
        tree_b.commit('message', rev_id='rev2b')
365
365
        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_c \n'),
366
366
                                  ('tree_a/file_2', 'content_x\rcontent_z\r')])