svn related crash

[Sabin Iacob]

Hello

I am using 2 related branches that reside in svn, and someone had the 
bright idea to modify the same file in both branches (a debian/postinst 
file) and commit them in the same changeset; now, when I try to branch 
(branches use a shared repo locally), I get this:

bzr: ERROR: bzrlib.errors.KnitCorrupt: Knit inventory corrupt:
  sha-1 c0fe959a9273db9c58afa3036ff73dd81ef96cf6
  of reconstructed text does not match
  expected 4c0d4ed7885fa37c853b8ab0e00beea0380f85e7
  for version 
svn-v3-trunk1:2167f8d4-df02-0410-9cfe-a89d12025c1d:myproject-web%2Ftrunk:4971

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 846, 
in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 797, 
in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 499, 
in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 942, 
in run
    hardlink=hardlink)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/remote.py", 
line 76, in sprout
    result_repo.fetch(repo, revision_id=revision_id)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 
953, in fetch
    return inter.fetch(revision_id=revision_id, pb=pb, 
find_ghosts=find_ghosts)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/fetch.py", 
line 703, in fetch
    self._fetch_switch(conn, needed, pb)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/fetch.py", 
line 624, in _fetch_switch
    parent_inv = self.target.get_inventory(parent_revid)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 
127, in read_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 
1490, in get_inventory
    return self.iter_inventories([revision_id]).next()
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 
1508, in _iter_inventories
    texts = self.get_inventory_weave().get_texts(revision_ids)
  File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 1140, in 
get_texts
    return [''.join(l) for l in self.get_line_list(version_ids)]
  File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 1146, 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 1203, in 
_get_content_maps
    (actual_sha, digest, version_id))
KnitCorrupt: Knit inventory corrupt:
  sha-1 c0fe959a9273db9c58afa3036ff73dd81ef96cf6
  of reconstructed text does not match
  expected 4c0d4ed7885fa37c853b8ab0e00beea0380f85e7
  for version 
svn-v3-trunk1:2167f8d4-df02-0410-9cfe-a89d12025c1d:myproject-web%2Ftrunk:4971

bzr 1.5 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'branch', 
'svn+ssh://svn/svnroot/myproject/myproject-web/trunk', 'trunk']
encoding: 'ANSI_X3.4-1968', fsenc: 'ANSI_X3.4-1968', lang: None
plugins:
  bzrtools             
/usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [1.5.0]
  configtools          /home/iacobs/.bazaar/plugins/configtools [unknown]
  dbus                 
/usr/lib/python2.5/site-packages/bzrlib/plugins/dbus [unknown]
  gtk                  
/usr/lib/python2.5/site-packages/bzrlib/plugins/gtk [0.95.0dev1]
  launchpad            
/usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
  multiparent          
/usr/lib/python2.5/site-packages/bzrlib/plugins/multiparent.py [unknown]
  rebase               /home/iacobs/.bazaar/plugins/rebase [unknown]
  svn                  
/usr/lib/python2.5/site-packages/bzrlib/plugins/svn [0.4.10]
*** 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.

Is there any way to recover my history from this?