corrupt: sha-1 of reconstructed text does not match expected sha-1

[Olivier R-D]

I got a crash when trying to merge 2 branches. Not being an bzr expert I 
do not really know what to do now ?
Has someone any idea ?

one of the branches uses bzr-svn and some developpers use windows but 
this happen between 2 bzr branches. I first got the prolem with the 
standard bzr version in ubuntu jaunty (2.13) so I updated to the latest 
1.17 but I get the same problem.
After the crash when merging I get the same stack when doing 'bzr check'


  [/                   ] Finding revisions 
                                                    [#########- 
  ] Fetching revisions:Get stream source 
 
 
         bzr: ERROR: bzrlib.errors.SHA1KnitCorrupt: Knit 
<bzrlib.knit._VFContentMapGenerator object at 0x2238590> corrupt: sha-1 
of reconstructed text does not match expected sha-1. key 
('olivier at utopie-20090804160356-d8ff6r5dkn1zxwhw',) expected sha 
da1a4601fb774e1c0272fc5171db42d3c6854c41 actual sha 
a4f8fc25acab95e37e7f2b47090aa47dd585f06e

Traceback (most recent call last):
   File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 835, 
in exception_to_return_code
     return the_callable(*args, **kwargs)
   File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 
1030, in run_bzr
     ret = run(*run_argv)
   File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 647, 
in run_argv_aliases
     return self.run(**all_cmd_args)
   File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 
3683, in run
     location, revision, remember, possible_transports, pb)
   File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 
3790, in _get_merger_from_branch
     other_revision_id, base_revision_id, other_branch, base_branch)
   File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 204, in 
from_revision_ids
     merger.set_other_revision(other, other_branch)
   File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 344, in 
set_other_revision
     self.other_tree = self.revision_tree(revision_id)
   File "/usr/lib/python2.6/dist-packages/bzrlib/merge.py", line 220, in 
revision_tree
     tree = branch.repository.revision_tree(revision_id)
   File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 
138, in read_locked
     result = unbound(self, *args, **kwargs)
   File "/usr/lib/python2.6/dist-packages/bzrlib/repository.py", line 
2363, in revision_tree
     inv = self.get_revision_inventory(revision_id)
   File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 
138, in read_locked
     result = unbound(self, *args, **kwargs)
   File "/usr/lib/python2.6/dist-packages/bzrlib/repository.py", line 
2322, in get_revision_inventory
     return self.get_inventory(revision_id)
   File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 
138, in read_locked
     result = unbound(self, *args, **kwargs)
   File "/usr/lib/python2.6/dist-packages/bzrlib/repository.py", line 
2179, in get_inventory
     return self.iter_inventories([revision_id]).next()
   File "/usr/lib/python2.6/dist-packages/bzrlib/repository.py", line 
2198, in _iter_inventories
     for text, revision_id in self._iter_inventory_xmls(revision_ids):
   File "/usr/lib/python2.6/dist-packages/bzrlib/repository.py", line 
2207, in _iter_inventory_xmls
     text_chunks[record.key] = record.get_bytes_as('chunked')
   File "/usr/lib/python2.6/dist-packages/bzrlib/knit.py", line 358, in 
get_bytes_as
     chunks = self._generator._get_one_work(self.key).text()
   File "/usr/lib/python2.6/dist-packages/bzrlib/knit.py", line 2104, in 
_get_one_work
     raise SHA1KnitCorrupt(self, actual_sha, digest, key, text)
SHA1KnitCorrupt: Knit <bzrlib.knit._VFContentMapGenerator object at 
0x2238590> corrupt: sha-1 of reconstructed text does not match expected 
sha-1. key ('olivier at utopie-20090804160356-d8ff6r5dkn1zxwhw',) expected 
sha da1a4601fb774e1c0272fc5171db42d3c6854c41 actual sha 
a4f8fc25acab95e37e7f2b47090aa47dd585f06e

bzr 1.17 on python 2.6.2 (linux2)
arguments: ['/usr/bin/bzr', 'merge', '../toto']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
   bzrtools 
/usr/lib/python2.6/dist-packages/bzrlib/plugins/bzrtools [1.17]
   launchpad 
/usr/lib/python2.6/dist-packages/bzrlib/plugins/launchpad [1.17]
   netrc_credential_store 
/usr/lib/python2.6/dist-packages/bzrlib/plugins/netrc_credential_store 
[1.17]
*** 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.