/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_non_ascii.py

  • Committer: John Arbash Meinel
  • Date: 2008-09-02 18:37:02 UTC
  • mfrom: (3678 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3680.
  • Revision ID: john@arbash-meinel.com-20080902183702-16cpowcusfvo7rpv
Merge bzr.dev 3678, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_non_ascii.py
235
235
        txt = self.run_bzr_decode('pull', working_dir=dirname2)
236
236
 
237
237
        expected = osutils.pathjoin(osutils.getcwd(), dirname1)
238
 
        self.assertEqual(u'Using saved location: %s/\n'
 
238
        self.assertEqual(u'Using saved parent location: %s/\n'
239
239
                'No revisions to pull.\n' % (expected,), txt)
240
240
 
241
241
        self.build_tree_contents(