AssertionError Unexpected revision id

[niels]

I tried to push some changes into the svn. Unfortunately it's crashed. Now I have diverged branches. Both have the same extra commit, but for bzr they are not the same :-(

HTTP subway, Realm: 'My Subversion server' username: firstname
HTTP firstname@subway, Realm: 'My Subversion server' password:
Repository with UUID 9d07529c-6093-4990-99b7-bc8da3841d3b at http://subway/rephh/zzs-gen contains fewer revisions than cache. This either me
ans that this repository contains an out of date mirror of another repository (harmless), or that the UUID is being used for two different S
ubversion repositories (potential repository corruption).
bzr: ERROR: exceptions.AssertionError: Unexpected revision id <email address hidden> != firstname.lastname@company.
de-20120426120637-jd43c655kblru92f

Traceback (most recent call last):
  File "bzrlib\commands.pyo", line 920, in exception_to_return_code
  File "bzrlib\commands.pyo", line 1131, in run_bzr
  File "bzrlib\commands.pyo", line 673, in run_argv_aliases
  File "bzrlib\commands.pyo", line 695, in run
  File "bzrlib\cleanup.pyo", line 136, in run_simple
  File "bzrlib\cleanup.pyo", line 166, in _do_with_cleanups
  File "bzrlib\builtins.pyo", line 1361, in run
  File "bzrlib\push.pyo", line 145, in _show_push_branch
  File "C:/Program Files (x86)/Bazaar-2.5/plugins\svn\remote.py", line 551, in push_branch
  File "bzrlib\branch.pyo", line 1142, in push
  File "C:/Program Files (x86)/Bazaar-2.5/plugins\svn\branch.py", line 1152, in push
  File "C:/Program Files (x86)/Bazaar-2.5/plugins\svn\branch.py", line 1131, in _basic_push
  File "C:/Program Files (x86)/Bazaar-2.5/plugins\svn\branch.py", line 1093, in _update_revisions
  File "C:/Program Files (x86)/Bazaar-2.5/plugins\svn\branch.py", line 1073, in _push
  File "C:/Program Files (x86)/Bazaar-2.5/plugins\svn\push.py", line 340, in push_branch
  File "C:/Program Files (x86)/Bazaar-2.5/plugins\svn\push.py", line 361, in push_todo
  File "C:/Program Files (x86)/Bazaar-2.5/plugins\svn\push.py", line 398, in push_revision_series
  File "C:/Program Files (x86)/Bazaar-2.5/plugins\svn\push.py", line 417, in push_revision_inclusive
  File "C:/Program Files (x86)/Bazaar-2.5/plugins\svn\push.py", line 447, in push_single_revision
  File "C:/Program Files (x86)/Bazaar-2.5/plugins\svn\push.py", line 178, in push_revision_tree
  File "C:/Program Files (x86)/Bazaar-2.5/plugins\svn\errors.py", line 141, in convert
  File "C:/Program Files (x86)/Bazaar-2.5/plugins\svn\commit.py", line 916, in commit
AssertionError: Unexpected revision id <email address hidden> != <email address hidden>
655kblru92f

bzr 2.5.0 on python 2.6.6 (Windows-7-6.1.7601-SP1)
arguments: ['bzr', 'push', 'http://subway/rephh/zzs-gen/']
plugins: bzrtools[2.5.0], changelog_merge[2.5.0], colo[0.4.0],
    difftools[0.91.0], explorer[1.2.2], extmerge[unknown],
    fastimport[0.14.0dev], git[0.6.7], launchpad[2.5.0], loom[2.3.0dev],
    news_merge[2.5.0], pipeline[1.4.0], qbzr[0.22.1],
    recursdiff[0.1.0.draft.0], rewrite[0.6.4dev], svn[1.2.1],
    upload[1.2.0dev], xmloutput[0.8.8]
encoding: 'cp1252', fsenc: 'mbcs', lang: None

*** Bazaar has encountered an internal error. This probably indicates a
    bug in Bazaar. You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.

[niels (opensource21)]

One problem could be that the cache of two different svn-repositories are the same.