/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: 2007-08-02 06:40:58 UTC
  • mfrom: (2666 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2668.
  • Revision ID: andrew.bennetts@canonical.com-20070802064058-09eblz1qbc01fcr3
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
163
163
                           show_ids=show_ids,
164
164
                           show_unchanged=show_unchanged,
165
165
                           short_status=False)
166
 
            conflict_title = False
167
 
            # show the new conflicts only for now. XXX: get them from the delta.
168
 
            for conflict in new.conflicts():
169
 
                if not short and conflict_title is False:
170
 
                    print >> to_file, "conflicts:"
171
 
                    conflict_title = True
 
166
            # show the new conflicts only for now. XXX: get them from the
 
167
            # delta.
 
168
            conflicts = new.conflicts()
 
169
            if specific_files is not None:
 
170
                conflicts = conflicts.select_conflicts(new, specific_files,
 
171
                    ignore_misses=True, recurse=True)[1]
 
172
            if len(conflicts) > 0 and not short:
 
173
                print >> to_file, "conflicts:"
 
174
            for conflict in conflicts:
172
175
                if short:
173
176
                    prefix = 'C  '
174
177
                else: