Bundle merge error

[John Whitley]

Hi all,

I received the error[1] below trying to apply Aaron's remove knit  
caches bundle to a branch on Cygwin.  I'd suspected that line endings  
weren't preserved when I transferred the bundle over to that system,  
as I just forwarded Aaron's email to myself.  ^^;  That intuition  
turned out to be correct, as the bundle applied correctly after  
flipping line-endings with 'd2u'.

I have it in mind that it would be nice to leverage versioned line- 
ending properties in the context of bundles to handle this case more  
elegantly.  That would help improve the robustness of bundles in the  
face of one common type of transformation, while preserving  
transparency of bundle contents per prior bundle discussions.

-- John

[1] Via bzr.dev revno 1816 under an up-to-date Cygwin installation on  
Win XP.

bzr: ERROR: bzrlib.errors.MalformedHeader:

Traceback (most recent call last):
   File "/home/jwhitley/src/bzr/no-knit-cache/bzrlib/commands.py",  
line 692, in run_bzr_catch_errors
     return run_bzr(argv)
   File "/home/jwhitley/src/bzr/no-knit-cache/bzrlib/commands.py",  
line 655, in run_bzr
     ret = run(*run_argv)
   File "/home/jwhitley/src/bzr/no-knit-cache/bzrlib/commands.py",  
line 281, in run_argv_aliases
     return self.run(**all_cmd_args)
   File "/home/jwhitley/src/bzr/no-knit-cache/bzrlib/builtins.py",  
line 2058, in run
     reader = bundle.read_bundle_from_url(branch)
   File "/home/jwhitley/src/bzr/no-knit-cache/bzrlib/bundle/ 
__init__.py", line 41, in read_bundle_from_url
     return read_bundle(f)
   File "/home/jwhitley/src/bzr/no-knit-cache/bzrlib/bundle/ 
serializer/__init__.py", line 56, in read_bundle
     raise errors.MalformedHeader()
MalformedHeader

bzr 0.9.0dev0 on python 2.4.3.final.0 (cygwin)
arguments: ['./bzr', 'merge', './remove-knit-cache.bzb']

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