/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_dpush.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_dpush.py
61
61
    def test_dpush(self):
62
62
        branch = self.make_dummy_builder('d').get_branch()
63
63
 
64
 
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
 
64
        dc = branch.controldir.sprout('dc', force_new_repo=True)
65
65
        self.build_tree(("dc/foo", "blaaaa"))
66
66
        dc.open_workingtree().commit('msg')
67
67
 
76
76
    def test_dpush_new(self):
77
77
        b = self.make_dummy_builder('d').get_branch()
78
78
 
79
 
        dc = b.bzrdir.sprout('dc', force_new_repo=True)
 
79
        dc = b.controldir.sprout('dc', force_new_repo=True)
80
80
        self.build_tree_contents([("dc/foofile", "blaaaa")])
81
81
        dc_tree = dc.open_workingtree()
82
82
        dc_tree.add("foofile")
95
95
    def test_dpush_wt_diff(self):
96
96
        b = self.make_dummy_builder('d').get_branch()
97
97
 
98
 
        dc = b.bzrdir.sprout('dc', force_new_repo=True)
 
98
        dc = b.controldir.sprout('dc', force_new_repo=True)
99
99
        self.build_tree_contents([("dc/foofile", "blaaaa")])
100
100
        dc_tree = dc.open_workingtree()
101
101
        dc_tree.add("foofile")
122
122
 
123
123
        b = builder.get_branch()
124
124
 
125
 
        dc = b.bzrdir.sprout('dc', force_new_repo=True)
 
125
        dc = b.controldir.sprout('dc', force_new_repo=True)
126
126
        dc_tree = dc.open_workingtree()
127
127
 
128
128
        self.build_tree_contents([("dc/foo", "bar")])