← Back to branch summary

~guilhem-bichot/bzr/bzr-pull-verbose-shows-tip-before-pull

« back to all changes in this revision

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

  • Committer: Guilhem Bichot
  • Date: 2009-12-09 21:03:32 UTC
  • Revision ID: guilhem@mysql.com-20091209210332-5vxgmhuq2kq2xfcr
an attempt at a clearer message.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
429
429
        self.addCleanup(b.unlock)
430
430
        b.bzrdir.sprout('target', revision_id='C')
431
431
        out = self.run_bzr('pull -d target -v --overwrite')[0]
432
 
        self.assertContainsRe(out, 'Tip revision no longer in ancestry.'
433
 
                                   ' Was revid:C')
 
432
        self.assertContainsRe(out, 'Tip revision before pull is no longer in'
 
433
                                   ' this branch. Was revid:C')
434
434
 
435
435
    def test_pull_verbose_does_not_print_tip_when_nothing_is_pulled(self):
436
436
        parent = self.make_branch_and_tree('parent')