/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: Robert Collins
  • Date: 2006-03-03 02:09:49 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060303020949-0ddc6f33d0a43943
Smoke test for RevisionStore factories creating revision stores.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
136
136
 
137
137
        if new_is_working_tree:
138
138
            list_paths('unknown', new.unknowns(), specific_files, to_file)
139
 
            conflict_title = False
140
 
            for conflict in wt.conflicts():
141
 
                if conflict_title is False:
142
 
                    print >> to_file, "conflicts:"
143
 
                    conflict_title = True
144
 
                print >> to_file, "  %s" % conflict
 
139
            list_paths('conflicts', new.iter_conflicts(), specific_files, to_file)
145
140
        if new_is_working_tree and show_pending:
146
141
            show_pending_merges(new, to_file)
147
142
    finally: