/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_update.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_update.py
200
200
        checkout1 = checkout_dir.create_workingtree('m1')
201
201
 
202
202
        # Create a second branch, with an extra commit
203
 
        other = master.bzrdir.sprout('other').open_workingtree()
 
203
        other = master.controldir.sprout('other').open_workingtree()
204
204
        self.build_tree(['other/file2'])
205
205
        other.add(['file2'])
206
206
        other.commit('other2', rev_id='o2')
256
256
        checkout1 = checkout_dir.create_workingtree('m1')
257
257
 
258
258
        # Create a second branch, with an extra commit
259
 
        other = master.bzrdir.sprout('other').open_workingtree()
 
259
        other = master.controldir.sprout('other').open_workingtree()
260
260
        self.build_tree(['other/file2'])
261
261
        other.add(['file2'])
262
262
        other.commit('other2', rev_id='o2')
311
311
        master.commit('one', rev_id='m1')
312
312
 
313
313
        # Create a second branch, with extra commits
314
 
        other = master.bzrdir.sprout('other').open_workingtree()
 
314
        other = master.controldir.sprout('other').open_workingtree()
315
315
        self.build_tree(['other/file2', 'other/file3'])
316
316
        other.add(['file2'])
317
317
        other.commit('other2', rev_id='o2')