bzr-svn and merges

[Sabin Iacob]

Hi list

Problem: 2 svn branches (trunk and a "branch"); trunk is pushed with 
bzr-svn; than the branch is created the usual way (svn cp trunk 
branches/whatever). I needed to commit some fixes from trunk to the 
"whatever" branch, so I tried the following:

 * push directly from the bzr-managed trunk; said branches had diverged 
(although I hadn't touched the "whatever" branch in the mean while), bzr 
merge failed with something like

bzr: ERROR: Revision {iacobs at moria-20070603224727-mblz3wga9ynlma7t} not 
present in 
ee/5753%40b8457f37-d9ea-0310-8a92-e5e31aec5664%253aze-project%25252%2546trunk%253a.kndx

 * bzr branch http://svn.server.tld/ze-project/branches/whatever 
whatever, then merge with the local bzr-managed trunk; got a big and 
ugly backtrace:

bzr: ERROR: bzrlib.errors.KnitCorrupt: Knit inventory corrupt: sha-1 
does not match iacobs at moria-20070604081204-gx5qpolswmpl62jj

Traceback (most recent call last):
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 718, 
in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 679, 
in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 375, 
in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.4/site-packages/bzrlib/builtins.py", line 2736, 
in run
    change_reporter=change_reporter)
  File "/usr/lib/python2.4/site-packages/bzrlib/builtins.py", line 3736, 
in _merge_helper
    merger.set_other(other_revision)
  File "/usr/lib/python2.4/site-packages/bzrlib/merge.py", line 217, in 
set_other
    self.this_branch)
  File "/usr/lib/python2.4/site-packages/bzrlib/merge.py", line 68, in 
_get_tree
    return branch, _get_revid_tree(branch, revision_id, local_branch)
  File "/usr/lib/python2.4/site-packages/bzrlib/merge.py", line 78, in 
_get_revid_tree
    base_tree = local_branch.repository.revision_tree(revision_id)
  File "/usr/lib/python2.4/site-packages/bzrlib/decorators.py", line 
127, in read_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.4/site-packages/bzrlib/repository.py", line 
805, in revision_tree
    inv = self.get_revision_inventory(revision_id)
  File "/usr/lib/python2.4/site-packages/bzrlib/decorators.py", line 
127, in read_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.4/site-packages/bzrlib/repository.py", line 
777, in get_revision_inventory
    return self.get_inventory(revision_id)
  File "/usr/lib/python2.4/site-packages/bzrlib/decorators.py", line 
127, in read_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.4/site-packages/bzrlib/repository.py", line 
629, in get_inventory
    return self.deserialise_inventory(
  File "/usr/lib/python2.4/site-packages/bzrlib/decorators.py", line 
127, in read_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.4/site-packages/bzrlib/repository.py", line 
653, in get_inventory_xml
    return iw.get_text(revision_id)
  File "/usr/lib/python2.4/site-packages/bzrlib/knit.py", line 802, in 
get_text
    return self.get_texts([version_id])[0]
  File "/usr/lib/python2.4/site-packages/bzrlib/knit.py", line 805, in 
get_texts
    return [''.join(l) for l in self.get_line_list(version_ids)]
  File "/usr/lib/python2.4/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.4/site-packages/bzrlib/knit.py", line 865, in 
_get_content_maps
    'sha-1 does not match %s' % version_id)
KnitCorrupt: Knit inventory corrupt: sha-1 does not match 
iacobs at moria-20070604081204-gx5qpolswmpl62jj

both branches appear to be fine otherwise (I can branch/commit/push them 
just fine).

any ideas?