/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 breezy/transform.py

  • Committer: Jelmer Vernooij
  • Date: 2020-11-19 18:28:52 UTC
  • mto: This revision was merged to the branch mainline in revision 7526.
  • Revision ID: jelmer@jelmer.uk-20201119182852-4za22s5mhakix4dq
Remove sixish data type.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
745
745
                unversioned_filter=working_tree.is_ignored)
746
746
            delta.report_changes(tt.iter_changes(), change_reporter)
747
747
        for conflict in conflicts:
748
 
            trace.warning(text_type(conflict))
 
748
            trace.warning(str(conflict))
749
749
        pp.next_phase()
750
750
        tt.apply()
751
751
        if working_tree.supports_merge_modified():