/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 bzrlib/shelf_ui.py

  • Committer: Vincent Ladeuil
  • Date: 2010-10-15 11:20:45 UTC
  • mfrom: (5499 +trunk)
  • mto: (5499.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5500.
  • Revision ID: v.ladeuil+lp@free.fr-20101015112045-5133zwua3wu4k4xk
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf_ui.py
493
493
        tt = tree_merger.make_preview_transform()
494
494
        new_tree = tt.get_preview_tree()
495
495
        if self.write_diff_to is None:
496
 
            self.write_diff_to = ui.ui_factory.make_output_stream()
 
496
            self.write_diff_to = ui.ui_factory.make_output_stream(encoding_type='exact')
497
497
        path_encoding = osutils.get_diff_header_encoding()
498
498
        diff.show_diff_trees(merger.this_tree, new_tree, self.write_diff_to,
499
499
            path_encoding=path_encoding)