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

  • Committer: Martin Pool
  • Date: 2011-05-26 03:00:40 UTC
  • mfrom: (5915 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5916.
  • Revision ID: mbp@canonical.com-20110526030040-aesg1r59tdyz5nyf
resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
811
811
        raw_conflicts = resolve_conflicts(tt)
812
812
        cooked_conflicts = cook_conflicts(raw_conflicts, tt)
813
813
        tt.finalize()
814
 
        conflicts_s = [str(c) for c in cooked_conflicts]
 
814
        conflicts_s = [unicode(c) for c in cooked_conflicts]
815
815
        self.assertEqual(len(cooked_conflicts), len(conflicts_s))
816
816
        self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy.  '
817
817
                                         'Moved existing file to '