← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.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/transform.py
18
18
import errno
19
19
from stat import S_ISREG
20
20
 
21
 
from bzrlib.conflicts import conflicts_to_strings
22
21
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
23
22
                           ReusingTransform, NotVersionedError, CantMoveRoot,
24
23
                           ExistingLimbo, ImmortalLimbo)
1082
1081
            raw_conflicts = resolve_conflicts(tt, child_pb)
1083
1082
        finally:
1084
1083
            child_pb.finished()
1085
 
        for line in conflicts_to_strings(cook_conflicts(raw_conflicts, tt)):
1086
 
            warning(line)
 
1084
        for conflict in cook_conflicts(raw_conflicts, tt):
 
1085
            warning(conflict)
1087
1086
        pp.next_phase()
1088
1087
        tt.apply()
1089
1088
        working_tree.set_merge_modified({})