Bug in bzr merge

Ulrik Mikaelsson ulrik.mikaelsson at gmail.com
Fri Aug 24 22:57:27 BST 2007


When merging the following branch;
---------------------------
ulrik at ulrik-desktop:~/programming/kde4/src/kdelibs$ bzr info
Checkout (format: dirstate)
Location:
       checkout root: file:///home/ulrik/programming/kde4/src/kdelibs/
  checkout of branch:
sftp://bazaar.launchpad.net/%7Erawler/kdelibs/kshortcutassistant/

Related branches:
      parent branch: http://bazaar.launchpad.net/~vcs-imports/kdelibs/kde4/
  publish to branch:
sftp://bazaar.launchpad.net/%7Erawler/kdelibs/kshortcutassistant/
---------------------------

I get the problem;

---------------------------
ulrik at ulrik-desktop:~/programming/kde4/src/kdelibs$ bzr merge
Merging from remembered location
http://bazaar.launchpad.net/~vcs-imports/kdelibs/kde4/
bzr: ERROR: bzrlib.errors.KnitCorrupt: Knit
58/khtmlkmultipartkmult-20070731173951-mlz3yt9t3s1a138u-10680.knit
corrupt: While reading
{vcs-imports at canonical.com-20070819060939-emr7m9r7ytzi70gf} got
IOError(CRC check failed 3960685616 913143941)

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line
729, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line
691, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line
389, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2709, in run
    change_reporter=change_reporter)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line
3743, in _merge_helper
    conflicts = merger.do_merge()
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 318, in do_merge
    **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 461, in __init__
    file_status = self.merge_contents(file_id)
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 683,
in merge_contents
    self.other_tree, trans_id)
  File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line
1391, in create_by_entry
    lines = tree.get_file(entry.file_id).readlines()
  File "/usr/lib/python2.5/site-packages/bzrlib/revisiontree.py", line
81, in get_file
    return StringIO(self.get_file_text(file_id))
  File "/usr/lib/python2.5/site-packages/bzrlib/revisiontree.py", line
77, in get_file_text
    return ''.join(self.get_file_lines(file_id))
  File "/usr/lib/python2.5/site-packages/bzrlib/revisiontree.py", line
73, in get_file_lines
    return weave.get_lines(ie.revision)
  File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 776, in get_lines
    return self.get_line_list([version_id])[0]
  File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 812, in
get_line_list
    text_map, content_map = self._get_content_maps(version_ids)
  File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 825, in
_get_content_maps
    record_map = self._get_record_map(version_ids)
  File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 794, in
_get_record_map
    self._data.read_records_iter(records):
  File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 1608,
in read_records_iter
    content, digest = self._parse_record(version_id, data)
  File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 1514,
in _parse_record
    % (version_id, e.__class__.__name__, str(e)))
KnitCorrupt: Knit
58/khtmlkmultipartkmult-20070731173951-mlz3yt9t3s1a138u-10680.knit
corrupt: While reading
{vcs-imports at canonical.com-20070819060939-emr7m9r7ytzi70gf} got
IOError(CRC check failed 3960685616 913143941)

bzr 0.18.0 on python 2.5.1.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'merge']

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



More information about the bazaar mailing list