bzr crash when merging from a patch file.

[David Ingamells]

I received the following crash from bzr when doing a merge from a patch 
file.
Two of the updated files in the patch had no newline at the end of the 
file.

When these newlines were added theresulting patch file merged OK.

This was with bzr version 1.2 on an Ubuntu Gutsy Gibbon machine.

bzr: ERROR: bzrlib.errors.KnitCorrupt: Knit <bzrlib.knit._KnitAccess 
object at 0x89518cc> corrupt: incorrect number of lines 26 != 27 for 
version {yves.daemen at msdes033-20080506110819-ig0odz5l61hcyhna}

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 834, 
in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 790, 
in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 492, 
in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2829, 
in run
    mergeable, pb)
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 149, in 
from_mergeable
    mergeable.install_revisions(tree.branch.repository)
  File "/usr/lib/python2.5/site-packages/bzrlib/merge_directive.py", 
line 194, in install_revisions
    info.install_revisions(target_repo, stream_input=False)
  File 
"/usr/lib/python2.5/site-packages/bzrlib/bundle/serializer/v4.py", line 
410, in install_revisions
    return ri.install()
  File 
"/usr/lib/python2.5/site-packages/bzrlib/bundle/serializer/v4.py", line 
478, in install
    result = self._install_in_write_group()
  File 
"/usr/lib/python2.5/site-packages/bzrlib/bundle/serializer/v4.py", line 
501, in _install_in_write_group
    pending_file_records)
  File 
"/usr/lib/python2.5/site-packages/bzrlib/bundle/serializer/v4.py", line 
549, in _install_mp_records
    versionedfile.add_mpdiffs(vf_records)
  File "/usr/lib/python2.5/site-packages/bzrlib/versionedfile.py", line 
268, in add_mpdiffs
    zip(records, self.get_sha1s(versions)):
  File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 705, in 
get_sha1s
    record_map = self._get_record_map(version_ids)
  File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 1050, in 
_get_record_map
    self._data.read_records_iter(records):
  File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 2496, in 
read_records_iter
    content, digest = self._parse_record(version_id, data)
  File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 2412, in 
_parse_record
    version_id))
KnitCorrupt: Knit <bzrlib.knit._KnitAccess object at 0x89518cc> corrupt: 
incorrect number of lines 26 != 27 for version 
{yves.daemen at msdes033-20080506110819-ig0odz5l61hcyhna}

bzr 1.2.0 on python 2.5.1.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'merge', 
'/data/id/CmsRoot/tasks/patches/782.patch']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
  launchpad            
/usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.