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

  • Committer: Andrew Bennetts
  • Date: 2011-06-02 07:25:33 UTC
  • mfrom: (5952 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5955.
  • Revision ID: andrew.bennetts@canonical.com-20110602072533-v0pe1ivh27cp0pd8
Merge lp:bzr.

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