~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2007-07-04 08:08:13 UTC
  • mfrom: (2572 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2587.
  • Revision ID: robertc@robertcollins.net-20070704080813-wzebx0r88fvwj5rq
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006 by Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
228
228
        os.chdir(u'../' + dirname2)
229
229
        txt = bzr('pull')
230
230
 
231
 
        self.assertEqual(u'Using saved location: %s/\n' % (pwd,), txt)
 
231
        self.assertEqual(u'Using saved location: %s/\n'
 
232
                'No revisions to pull.\n' % (pwd,), txt)
232
233
 
233
234
        os.chdir('../' + dirname1)
234
235
        open('a', 'ab').write('and yet more\n')