← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.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/merge.py
22
22
 
23
23
import bzrlib
24
24
from bzrlib.branch import Branch
25
 
from bzrlib.conflicts import conflicts_to_strings, ConflictList
 
25
from bzrlib.conflicts import ConflictList
26
26
from bzrlib.delta import compare_trees
27
27
from bzrlib.errors import (BzrCommandError,
28
28
                           BzrError,
371
371
            finally:
372
372
                child_pb.finished()
373
373
            self.cook_conflicts(fs_conflicts)
374
 
            for line in conflicts_to_strings(self.cooked_conflicts):
375
 
                warning(line)
 
374
            for conflict in self.cooked_conflicts:
 
375
                warning(conflict)
376
376
            self.pp.next_phase()
377
377
            results = self.tt.apply()
378
378
            self.write_modified(results)