/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_status.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_status.py
173
173
        wt = self.make_branch_and_tree('branch')
174
174
        b = wt.branch
175
175
        wt.commit("Empty commit 1")
176
 
        b_2_dir = b.bzrdir.sprout('./copy')
 
176
        b_2_dir = b.controldir.sprout('./copy')
177
177
        b_2 = b_2_dir.open_branch()
178
178
        wt2 = b_2_dir.open_workingtree()
179
179
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
548
548
        wt = self.make_branch_and_tree('branch1')
549
549
        b = wt.branch
550
550
        wt.commit('Empty commit 1')
551
 
        wt2 = b.bzrdir.sprout('branch2').open_workingtree()
 
551
        wt2 = b.controldir.sprout('branch2').open_workingtree()
552
552
        wt2.commit('Empty commit 2')
553
553
        out, err = self.run_bzr('status branch1 -rbranch:branch2')
554
554
        self.assertEqual('', out)
741
741
        self.build_tree(['a/a'])
742
742
        a_tree.add('a')
743
743
        a_tree.commit('a')
744
 
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
744
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
745
745
        self.build_tree(['b/b'])
746
746
        b_tree.add('b')
747
747
        b_tree.commit('b')
756
756
        self.build_tree_contents([('tree/a', 'content of a\n')])
757
757
        tree.add('a')
758
758
        r1_id = tree.commit('one')
759
 
        alt = tree.bzrdir.sprout('alt').open_workingtree()
 
759
        alt = tree.controldir.sprout('alt').open_workingtree()
760
760
        self.build_tree_contents([('alt/a', 'content of a\nfrom alt\n')])
761
761
        alt_id = alt.commit('alt')
762
762
        tree.merge_from_branch(alt.branch)