← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-26 08:05:45 UTC
  • mfrom: (5916 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5917.
  • Revision ID: john@arbash-meinel.com-20110526080545-5tprxfczyj4bfk0o
Merge bzr.dev 5916 and make sure the right patch is applied.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
2578
2578
            precomputed_delta = None
2579
2579
        conflicts = cook_conflicts(raw_conflicts, tt)
2580
2580
        for conflict in conflicts:
2581
 
            trace.warning(conflict)
 
2581
            trace.warning(unicode(conflict))
2582
2582
        try:
2583
2583
            wt.add_conflicts(conflicts)
2584
2584
        except errors.UnsupportedOperation:
2820
2820
                unversioned_filter=working_tree.is_ignored)
2821
2821
            delta.report_changes(tt.iter_changes(), change_reporter)
2822
2822
        for conflict in conflicts:
2823
 
            trace.warning(conflict)
 
2823
            trace.warning(unicode(conflict))
2824
2824
        pp.next_phase()
2825
2825
        tt.apply()
2826
2826
        working_tree.set_merge_modified(merge_modified)