← 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 18:30:55 UTC
  • mto: This revision was merged to the branch mainline in revision 2171.
  • Revision ID: john@arbash-meinel.com-20061207183055-h2snud1gnlgqe8x1
The texts expected 2 blank spaces after P, so give it to them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
190
190
            width = terminal_width()
191
191
            m_revision = branch.repository.get_revision(merge)
192
192
            if short:
193
 
                prefix = 'P'
194
 
            else: 
 
193
                prefix = 'P '
 
194
            else:
195
195
                prefix = ' '
196
196
            print >> to_file, prefix, line_log(m_revision, width - 4)
197
197
            inner_merges = branch.repository.get_ancestry(merge)
210
210
                ignore.add(mmerge)
211
211
        except errors.NoSuchRevision:
212
212
            if short:
213
 
                prefix = 'P'
 
213
                prefix = 'P '
214
214
            else:
215
215
                prefix = ' '
216
216
            print >> to_file, prefix, merge