← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: John Arbash Meinel
  • Date: 2006-12-07 20:25:00 UTC
  • mto: This revision was merged to the branch mainline in revision 2171.
  • Revision ID: john@arbash-meinel.com-20061207202500-cdhbw4uw9p60w21o
The logic for when to display 'C' for conflicts was inverted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
152
152
            if not short and conflict_title is False:
153
153
                print >> to_file, "conflicts:"
154
154
                conflict_title = True
155
 
            if not short:
156
 
                prefix = 'C'
 
155
            if short:
 
156
                prefix = 'C '
157
157
            else:
158
158
                prefix = ' '
159
 
            print >> to_file, prefix, " %s" % conflict
 
159
            print >> to_file, "%s %s" % (prefix, conflict)
160
160
        if new_is_working_tree and show_pending:
161
161
            show_pending_merges(new, to_file, short)
162
162
    finally: