/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/blackbox/test_find_merge_base.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/blackbox/test_find_merge_base.py
24
24
    def test_find_merge_base(self):
25
25
        a_tree = self.make_branch_and_tree('a')
26
26
        a_tree.commit(message='foo', allow_pointless=True)
27
 
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
27
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
28
28
        q = self.run_bzr('find-merge-base a b')[0]
29
29
        a_tree.commit(message='bar', allow_pointless=True)
30
30
        b_tree.commit(message='baz', allow_pointless=True)