/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 bzrlib/tests/blackbox/test_push.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
312
312
    def create_trunk_and_feature_branch(self):
313
313
        # We have a mainline
314
314
        trunk_tree = self.make_branch_and_tree('target',
315
 
            format='development')
 
315
            format='1.9')
316
316
        trunk_tree.commit('mainline')
317
317
        # and a branch from it
318
318
        branch_tree = self.make_branch_and_tree('branch',
319
 
            format='development')
 
319
            format='1.9')
320
320
        branch_tree.pull(trunk_tree.branch)
321
321
        branch_tree.branch.set_parent(trunk_tree.branch.base)
322
322
        # with some work on it
360
360
        trunk_tree, branch_tree = self.create_trunk_and_feature_branch()
361
361
        # the trunk is published on a web server
362
362
        self.transport_readonly_server = HttpServer
363
 
        trunk_public = self.make_branch('public_trunk', format='development')
 
363
        trunk_public = self.make_branch('public_trunk', format='1.9')
364
364
        trunk_public.pull(trunk_tree.branch)
365
365
        trunk_public_url = self.get_readonly_url('public_trunk')
366
366
        trunk_tree.branch.set_public_branch(trunk_public_url)
375
375
 
376
376
    def test_push_new_branch_stacked_no_parent(self):
377
377
        """Pushing with --stacked and no parent branch errors."""
378
 
        branch = self.make_branch_and_tree('branch', format='development')
 
378
        branch = self.make_branch_and_tree('branch', format='1.9')
379
379
        # now we do a stacked push, which should fail as the place to refer too
380
380
        # cannot be determined.
381
381
        out, err = self.run_bzr_error(