/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_uncommit.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_uncommit.py
161
161
    def test_uncommit_merges(self):
162
162
        wt = self.create_simple_tree()
163
163
 
164
 
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
164
        tree2 = wt.controldir.sprout('tree2').open_workingtree()
165
165
 
166
166
        tree2.commit('unchanged', rev_id='b3')
167
167
        tree2.commit('unchanged', rev_id='b4')
178
178
 
179
179
    def test_uncommit_pending_merge(self):
180
180
        wt = self.create_simple_tree()
181
 
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
181
        tree2 = wt.controldir.sprout('tree2').open_workingtree()
182
182
        tree2.commit('unchanged', rev_id='b3')
183
183
 
184
184
        wt.branch.fetch(tree2.branch)
191
191
    def test_uncommit_multiple_merge(self):
192
192
        wt = self.create_simple_tree()
193
193
 
194
 
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
194
        tree2 = wt.controldir.sprout('tree2').open_workingtree()
195
195
        tree2.commit('unchanged', rev_id='b3')
196
196
 
197
 
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
 
197
        tree3 = wt.controldir.sprout('tree3').open_workingtree()
198
198
        tree3.commit('unchanged', rev_id='c3')
199
199
 
200
200
        wt.merge_from_branch(tree2.branch)
213
213
    def test_uncommit_merge_plus_pending(self):
214
214
        wt = self.create_simple_tree()
215
215
 
216
 
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
216
        tree2 = wt.controldir.sprout('tree2').open_workingtree()
217
217
        tree2.commit('unchanged', rev_id='b3')
218
 
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
 
218
        tree3 = wt.controldir.sprout('tree3').open_workingtree()
219
219
        tree3.commit('unchanged', rev_id='c3')
220
220
 
221
221
        wt.branch.fetch(tree2.branch)
252
252
        # though it will also filter out ones in the ancestry
253
253
        wt = self.create_simple_tree()
254
254
 
255
 
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
256
 
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
 
255
        tree2 = wt.controldir.sprout('tree2').open_workingtree()
 
256
        tree3 = wt.controldir.sprout('tree3').open_workingtree()
257
257
 
258
258
        tree2.commit('unchanged', rev_id='b3')
259
259
        tree3.commit('unchanged', rev_id='c3')