← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_non_ascii.py
267
267
 
268
268
        expected = osutils.pathjoin(osutils.getcwd(), dirname1)
269
269
        self.assertEqual(u'Using saved parent location: %s/\n'
270
 
                'No revisions to pull.\n' % (expected,), txt)
 
270
                'No revisions or tags to pull.\n' % (expected,), txt)
271
271
 
272
272
        self.build_tree_contents(
273
273
            [(osutils.pathjoin(dirname1, 'a'), 'and yet more\n')])