bundle with binary file inside cannot be merged/pulled

[Alexander Belchenko]

If bundle contains binary file as base64-encoded string then this bundle
cannot be pulled or merged in. I can reproduce this with my bzr.ico
(attached). Bundle (binary.patch) that contain this file also attached.

Steps to reproduce:

bzr init a
bzr branch a b
cd a
copy bzr.ico into this directory
bzr add
bzr ci -m bzr.ico
bzr bundle -r0..1 --output=binary.patch
cd ../b
move biinary.patch to this directory
bzr merge binary.patch

This traceback was printed by most recent bzr.dev. I don't think it's a
windows-specific.

D:\user\MyCode\bzr\__test\b>bzr merge binary.patch
bzr: ERROR: bzrlib.patches.MalformedLine: Malformed line. Unknown line type
3yyyyyyyyR♦^yyyyyyyyyyyyyyyyyyy#↔yyyyyyyyrIyyyyyyyyyyyyyyyyyyyyjSyyyy
                                                                       (
    ► ☺ V~d NА_ UДd UЕe UЗ
f ZЕh WМi YКi aСq fУu cЦt eФt fЩw iЦx iЧx iЧy jЭ{ nЬ} sЮБ tЯГ rаБ rаВ
sбГ uаГ tбГ uаД uвЕ xвЖ xдЖ {гИ |зК |зЛ }зЛ ~йМ ⌂йН АиН Вй
П ЖлТ ИпХ М░Ш М▒Ш Н▒Щ О╡Ь Р│Ы Р╡Ь Р╢Э Ф╖Я Ф╢а Х╕а Ш╕г Ш║д Щ╗д Ы╝ж б╛л
и─▒ м─│ н╞╡ п╞╢ п╚╖ п╔╖ п╦╕ ▒╔╣ ╡╬╜ ╢═╛ ╖╬┐ ╕╧┐ ╖╨┐ ╣╨┴ ╗╙
├ ╝╥├ ╛╙┼ ┐╘╞ └╙╞ └╘╟ ┴╒╟ └╓╟ ├╓╔ ┬╫╔ ─╪╦ ╟╪╠ ╟┘═ ╩█╨ ╩▄╨ ╠▌╤ ╥▌╓ ╤р╓
╒у┘ ┘ф▌ ┘х▌ ▐шс ▐щт ▀щт ▀ъу ръу сыф сьх тьх уьх фэч цящ чя
щ чЁъ щёь ыёэ ыєэ ьєэ ёЎЄ ЄЎє Єўє ЄўЇ єўЇ Ї°ї ї∙ў ў·ў ў·° °·° °·∙ °√∙
∙√∙ ·№√ √№√ №¤№ CrRд ↨ <

Traceback (most recent call last):
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\commands.py", line 694,
in run_bzr_catch_errors
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\commands.py", line 656,
in run_bzr
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\commands.py", line 281,
in run_argv_aliases
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\builtins.py", line
2075, in run
    File
"E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\bundle\apply_bundle.py", line
36, in merge_bundle
    File
"E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\bundle\apply_bundle.py", line
22, in install_bundle
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\bundle\bundle_data.py",
line 181, in revision_tree
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\bundle\bundle_data.py",
line 692, in _get_inventory
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\bundle\bundle_data.py",
line 683, in add_entry
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\bundle\bundle_data.py",
line 637, in get_size_and_sha1
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\iterablefile.py", line
192, in read
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\iterablefile.py", line
84, in read_all
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\iterablefile.py", line
68, in _read
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\patches.py", line 387,
in iter_patched
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\patches.py", line 247,
in iter_hunks
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\patches.py", line 168,
in parse_line
MalformedLine: Malformed line. Unknown line type
3yyyyyyyyR♦^yyyyyyyyyyyyyyyyyyy#↔yyyyyyyyrIyyyyyyyyyyyyyyyyyyyyjSyyyy
                                                                       (
    ► ☺ V~d NА_ UДd UЕe UЗ
f ZЕh WМi YКi aСq fУu cЦt eФt fЩw iЦx iЧx iЧy jЭ{ nЬ} sЮБ tЯГ rаБ rаВ
sбГ uаГ tбГ uаД uвЕ xвЖ xдЖ {гИ |зК |зЛ }зЛ ~йМ ⌂йН АиН Вй
П ЖлТ ИпХ М░Ш М▒Ш Н▒Щ О╡Ь Р│Ы Р╡Ь Р╢Э Ф╖Я Ф╢а Х╕а Ш╕г Ш║д Щ╗д Ы╝ж б╛л
и─▒ м─│ н╞╡ п╞╢ п╚╖ п╔╖ п╦╕ ▒╔╣ ╡╬╜ ╢═╛ ╖╬┐ ╕╧┐ ╖╨┐ ╣╨┴ ╗╙
├ ╝╥├ ╛╙┼ ┐╘╞ └╙╞ └╘╟ ┴╒╟ └╓╟ ├╓╔ ┬╫╔ ─╪╦ ╟╪╠ ╟┘═ ╩█╨ ╩▄╨ ╠▌╤ ╥▌╓ ╤р╓
╒у┘ ┘ф▌ ┘х▌ ▐шс ▐щт ▀щт ▀ъу ръу сыф сьх тьх уьх фэч цящ чя
щ чЁъ щёь ыёэ ыєэ ьєэ ёЎЄ ЄЎє Єўє ЄўЇ єўЇ Ї°ї ї∙ў ў·ў ў·° °·° °·∙ °√∙
∙√∙ ·№√ √№√ №¤№ CrRд ↨ <

bzr 0.9.0dev0 on python 2.4.3.final.0 (win32)
arguments: ['c:\\utils\\bzr.py', 'merge', 'binary.patch']

[Alexander Belchenko (bialix)]

binary file to reproduce problem

[Alexander Belchenko (bialix)]

patch with bzr.ico inside

[John A Meinel (jameinel)]

should be in bzr.dev 1850