$ bzr unshelve --preview Using changes with id "1". M gensite.rb Text conflict in gensite.rb === modified file 'gensite.rb' --- a/gensite.rb 2010-11-25 15:07:48 +0000 +++ b/gensite.rb 2011-04-17 05:57:55 +0000 @@ -236,7 +236,12 @@ RewriteEngine On RewriteCond %{HTTP_HOST} ^example\.com RewriteRule (.*) http://www.example.com/$1 [R=301,L] +<<<<<<< TREE `) +======= +SetEnv PERL5LIB /home/perang/perl5/lib/perl5/i486-linux-gnu-thread-multi:/home/perang/perl5/lib/perl5 bzr: failed to report crash using apport: OSError(13, 'Permission denied') bzr: ERROR: exceptions.UnicodeDecodeError: 'ascii' codec can't decode byte 0xa7 in position 5: ordinal not in range(128) Traceback (most recent call last): File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 912, in exception_to_return_code return the_callable(*args, **kwargs) File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1112, in run_bzr ret = run(*run_argv) File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 690, in run_argv_aliases return self.run(**all_cmd_args) File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 705, in run return self._operation.run_simple(*args, **kwargs) File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 135, in run_simple self.cleanups, self.func, *args, **kwargs) File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups result = func(*args, **kwargs) File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 5923, in run unshelver.run() File "/usr/lib/python2.6/dist-packages/bzrlib/shelf_ui.py", line 480, in run self.write_diff(merger) File "/usr/lib/python2.6/dist-packages/bzrlib/shelf_ui.py", line 499, in write_diff path_encoding=path_encoding) File "/usr/lib/python2.6/dist-packages/bzrlib/diff.py", line 493, in show_diff_trees return differ.show_diff(specific_files, extra_trees) File "/usr/lib/python2.6/dist-packages/bzrlib/diff.py", line 942, in show_diff return self._show_diff(specific_files, extra_trees) File "/usr/lib/python2.6/dist-packages/bzrlib/diff.py", line 1002, in _show_diff self._diff(file_id, oldpath, newpath, kind[0], kind[1]) File "/usr/lib/python2.6/dist-packages/bzrlib/diff.py", line 1028, in _diff new_path, old_kind, new_kind) File "/usr/lib/python2.6/dist-packages/bzrlib/diff.py", line 555, in _diff_many new_kind) File "/usr/lib/python2.6/dist-packages/bzrlib/diff.py", line 693, in diff old_path, new_path) File "/usr/lib/python2.6/dist-packages/bzrlib/diff.py", line 716, in diff_text self.to_file, path_encoding=self.path_encoding) File "/usr/lib/python2.6/dist-packages/bzrlib/diff.py", line 117, in internal_diff to_file.write(line) File "/usr/lib/python2.6/dist-packages/bzrlib/ui/text.py", line 538, in write self.wrapped_stream.write(to_write) File "/usr/lib/python2.6/codecs.py", line 351, in write data, consumed = self.encode(object, self.errors) UnicodeDecodeError: 'ascii' codec can't decode byte 0xa7 in position 5: ordinal not in range(128) bzr 2.2.1 on python 2.6.6 (Linux-2.6.35-28-generic-x86_64-with-Ubuntu-10.10-maverick) arguments: ['/usr/bin/bzr', 'unshelve', '--preview'] encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.utf8' plugins: bash_completion /usr/lib/python2.6/dist-packages/bzrlib/plugins/bash_completion [2.2.1] bzrtools /usr/lib/python2.6/dist-packages/bzrlib/plugins/bzrtools [2.2.0] launchpad /usr/lib/python2.6/dist-packages/bzrlib/plugins/launchpad [2.2.1] netrc_credential_store /usr/lib/python2.6/dist-packages/bzrlib/plugins/netrc_credential_store [2.2.1] news_merge /usr/lib/python2.6/dist-packages/bzrlib/plugins/news_merge [2.2.1] svn /usr/lib/python2.6/dist-packages/bzrlib/plugins/svn [1.0.3]