← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-26 08:05:45 UTC
  • mfrom: (5916 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5917.
  • Revision ID: john@arbash-meinel.com-20110526080545-5tprxfczyj4bfk0o
Merge bzr.dev 5916 and make sure the right patch is applied.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
72
72
                    continue
73
73
                self.outf.write(conflict.path + '\n')
74
74
            else:
75
 
                self.outf.write(str(conflict) + '\n')
 
75
                self.outf.write(unicode(conflict) + '\n')
76
76
 
77
77
 
78
78
resolve_action_registry = registry.Registry()
148
148
                    trace.note('%d conflict(s) auto-resolved.', len(resolved))
149
149
                    trace.note('Remaining conflicts:')
150
150
                    for conflict in un_resolved:
151
 
                        trace.note(conflict)
 
151
                        trace.note(unicode(conflict))
152
152
                    return 1
153
153
                else:
154
154
                    trace.note('All conflicts resolved.')
291
291
    def to_strings(self):
292
292
        """Generate strings for the provided conflicts"""
293
293
        for conflict in self:
294
 
            yield str(conflict)
 
294
            yield unicode(conflict)
295
295
 
296
296
    def remove_files(self, tree):
297
297
        """Remove the THIS, BASE and OTHER files for listed conflicts"""
390
390
    def __ne__(self, other):
391
391
        return not self.__eq__(other)
392
392
 
393
 
    def __str__(self):
 
393
    def __unicode__(self):
394
394
        return self.format % self.__dict__
395
395
 
396
396
    def __repr__(self):