← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Ian Clatworthy
  • Date: 2008-04-02 07:32:09 UTC
  • mfrom: (3298.1.1 status_specific_files)
  • mto: This revision was merged to the branch mainline in revision 3327.
  • Revision ID: ian.clatworthy@canonical.com-20080402073209-3p1x2zmx8453ab8l
don't show pending merges when given an explicit list of files (John Arbash Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
134
134
                else:
135
135
                    prefix = ' '
136
136
                to_file.write("%s %s\n" % (prefix, conflict))
137
 
            if new_is_working_tree and show_pending:
 
137
            if (new_is_working_tree and show_pending
 
138
                and specific_files is None):
138
139
                show_pending_merges(new, to_file, short)
139
140
        finally:
140
141
            old.unlock()