← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Aaron Bentley
  • Date: 2006-04-05 20:37:37 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: abentley@panoramicfeedback.com-20060405203737-d50848ef2df7344a
Eliminated conflicts_to_strings, made remove_files a ConflictList member

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
16
16
 
17
17
import sys
18
18
 
19
 
from bzrlib.conflicts import conflicts_to_strings
20
19
from bzrlib.delta import compare_trees
21
20
from bzrlib.errors import NoSuchRevision
22
21
from bzrlib.log import line_log
138
137
        if new_is_working_tree:
139
138
            list_paths('unknown', new.unknowns(), specific_files, to_file)
140
139
            conflict_title = False
141
 
            for conflict in conflicts_to_strings(wt.conflicts()):
 
140
            for conflict in wt.conflicts():
142
141
                if conflict_title is False:
143
142
                    print >> to_file, "conflicts:"
144
143
                    conflict_title = True