win32: merging bundle error

[Alexander Belchenko]

I'm working on improving installer for bzr. I create bundle on one 
machine and move this bundle to another machine and want to merge them 
and continue my work. This bundle was created with bzr.dev 
revno~1805..1815 (I don't remember exactly). Now I'm use fresh bzr.dev 
revno.1827 with various win32-fixes from John Meinel (and most of this 
fixes is great work).

But I cannot merge bundle. Bundle in attachment. I have this error:

E:\work\MyCode\bzr\devel\bzr.dev.win32.installer>python bzr merge 
win32-installer.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.win32.installer\bzrlib\commands.py", 
line 693, in run_bzr_catch_errors
     return run_bzr(argv)
   File 
"E:\work\MyCode\bzr\devel\bzr.dev.win32.installer\bzrlib\commands.py", 
line 655, in run_bzr
     ret = run(*run_argv)
   File 
"E:\work\MyCode\bzr\devel\bzr.dev.win32.installer\bzrlib\commands.py", 
line 281, in run_argv_aliases
     return self.run(**all_cmd_args)
   File 
"E:\work\MyCode\bzr\devel\bzr.dev.win32.installer\bzrlib\builtins.py", 
line 2064, in run
     reprocess, show_base)
   File 
"E:\work\MyCode\bzr\devel\bzr.dev.win32.installer\bzrlib\bundle\apply_bundle.py", 
line 36, in merge_bundle
     install_bundle(tree.branch.repository, reader)
   File 
"E:\work\MyCode\bzr\devel\bzr.dev.win32.installer\bzrlib\bundle\apply_bundle.py", 
line 22, in install_bundle
     revision.revision_id)
   File 
"E:\work\MyCode\bzr\devel\bzr.dev.win32.installer\bzrlib\bundle\bundle_data.py", 
line 181, in revision_tree
     inv = bundle_tree.inventory
   File 
"E:\work\MyCode\bzr\devel\bzr.dev.win32.installer\bzrlib\bundle\bundle_data.py", 
line 692, in _get_inventory
     add_entry(file_id)
   File 
"E:\work\MyCode\bzr\devel\bzr.dev.win32.installer\bzrlib\bundle\bundle_data.py", 
line 683, in add_entry
     ie.text_size, ie.text_sha1 = self.get_size_and_sha1(file_id)
   File 
"E:\work\MyCode\bzr\devel\bzr.dev.win32.installer\bzrlib\bundle\bundle_data.py", 
line 637, in get_size_and_sha1
     content = fileobj.read()
   File 
"E:\work\MyCode\bzr\devel\bzr.dev.win32.installer\bzrlib\iterablefile.py"
, line 192, in read
     return self._file_base.read_all()
   File 
"E:\work\MyCode\bzr\devel\bzr.dev.win32.installer\bzrlib\iterablefile.py"
, line 84, in read_all
     return self._read(no_stop)
   File 
"E:\work\MyCode\bzr\devel\bzr.dev.win32.installer\bzrlib\iterablefile.py"
, line 68, in _read
     result += self._iter.next()
   File 
"E:\work\MyCode\bzr\devel\bzr.dev.win32.installer\bzrlib\patches.py", 
line 387, in iter_patched
     for hunk in iter_hunks(patch_lines):
   File 
"E:\work\MyCode\bzr\devel\bzr.dev.win32.installer\bzrlib\patches.py", 
line 247, in iter_hunks
     hunk_line = parse_line(iter_lines.next())
   File 
"E:\work\MyCode\bzr\devel\bzr.dev.win32.installer\bzrlib\patches.py", 
line 168, in parse_line
     raise MalformedLine("Unknown line type", 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: ['bzr', 'merge', 'win32-installer.patch']

** please send this report to bazaar-ng at lists.ubuntu.com


How I can help debug this?

--
Alexander
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: win32-installer.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20060630/3c2fceb2/attachment.diff