← 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: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with 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(