← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Martin
  • Date: 2011-05-21 16:43:19 UTC
  • mto: This revision was merged to the branch mainline in revision 5907.
  • Revision ID: gzlist@googlemail.com-20110521164319-5ua6aoazejsvef0w
Avoid implicit str casting in trace methods by calling unicode() on conflict objects first

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
194
194
                    prefix = 'C  '
195
195
                else:
196
196
                    prefix = ' '
197
 
                to_file.write("%s %s\n" % (prefix, conflict))
 
197
                to_file.write("%s %s\n" % (prefix, unicode(conflict)))
198
198
            # Show files that were requested but don't exist (and are
199
199
            # not versioned).  We don't involve delta in this; these
200
200
            # paths are really the province of just the status