bazaar bug - again

[Wichmann, Mats D]

I hit this one before and sent it in, but nothing really
happened. This time I'm really stuck due to it...

$ bzr merge ~/books.mgd
bzr: ERROR: bzrlib.errors.KnitCorrupt: Knit <bzrlib.knit._KnitAccess
object at 0x2aaaad799e50> corrupt: incorrect number of lines 4124 !=
4125 for version
{mats at freestandards.org-20071117024735-29u198lddc6rdq2w}

Traceback (most recent call last):
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 800,
in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 758,
in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 492,
in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.4/site-packages/bzrlib/builtins.py", line 2803,
in run
    conflict_count = merger.do_merge()
  File "/usr/lib/python2.4/site-packages/bzrlib/merge.py", line 375, in
do_merge
    change_reporter=self.change_reporter,
  File "/usr/lib/python2.4/site-packages/bzrlib/merge.py", line 475, in
__init__
    file_status = self.merge_contents(file_id)
  File "/usr/lib/python2.4/site-packages/bzrlib/merge.py", line 758, in
merge_contents
    self.other_tree, trans_id)
  File "/usr/lib/python2.4/site-packages/bzrlib/transform.py", line
1445, in create_by_entry
    lines = tree.get_file(entry.file_id).readlines()
  File "/usr/lib/python2.4/site-packages/bzrlib/revisiontree.py", line
86, in get_file
    return StringIO(self.get_file_text(file_id))
  File "/usr/lib/python2.4/site-packages/bzrlib/revisiontree.py", line
82, in get_file_text
    return ''.join(self.get_file_lines(file_id))
  File "/usr/lib/python2.4/site-packages/bzrlib/revisiontree.py", line
78, in get_file_lines
    return weave.get_lines(ie.revision)
  File "/usr/lib/python2.4/site-packages/bzrlib/knit.py", line 946, in
get_lines
    return self.get_line_list([version_id])[0]
  File "/usr/lib/python2.4/site-packages/bzrlib/knit.py", line 982, in
get_line_list
    text_map, content_map = self._get_content_maps(version_ids)
  File "/usr/lib/python2.4/site-packages/bzrlib/knit.py", line 997, in
_get_content_maps
    record_map = self._get_record_map(version_ids)
  File "/usr/lib/python2.4/site-packages/bzrlib/knit.py", line 963, in
_get_record_map
    for component_id, content, digest in \
  File "/usr/lib/python2.4/site-packages/bzrlib/knit.py", line 2158, in
read_records_iter
    content, digest = self._parse_record(version_id, data)
  File "/usr/lib/python2.4/site-packages/bzrlib/knit.py", line 2071, in
_parse_record
    'incorrect number of lines %s != %s'
KnitCorrupt: Knit <bzrlib.knit._KnitAccess object at 0x2aaaad799e50>
corrupt: incorrect number of lines 4124 != 4125 for version
{mats at freestandards.org-20071117024735-29u198lddc6rdq2w}

bzr 0.91.0 on python 2.4.3.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'merge', '/nethome/mats/books.mgd']

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