← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_pull.py

merge in trunk and i18n-errors

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
384
384
        self.assertNotContainsRe(
385
385
            out, r'revno: 1\ncommitter: .*\nbranch nick: source')
386
386
 
 
387
    def test_pull_smart_bound_branch(self):
 
388
        self.setup_smart_server_with_call_log()
 
389
        parent = self.make_branch_and_tree('parent')
 
390
        parent.commit(message='first commit')
 
391
        child = parent.bzrdir.sprout('child').open_workingtree()
 
392
        child.commit(message='second commit')
 
393
        checkout = parent.branch.create_checkout('checkout')
 
394
        self.run_bzr(['pull', self.get_url('child')], working_dir='checkout')
 
395
 
387
396
    def test_pull_smart_stacked_streaming_acceptance(self):
388
397
        """'bzr pull -r 123' works on stacked, smart branches, even when the
389
398
        revision specified by the revno is only present in the fallback