Problem after "bzr upgrade --rich-root-pack"

History recap:
(1) branch from svn.gnome.org/svn/gtk-css-engine (svn branch)
(2) push to bzr+ssh://bzr-playground.gnome.org/bzr/robsta/gtk-css-engine
(3) Branch from bzr+ssh://bzr-playground.gnome.org/bzr/robsta/gtk-css-engine
(4) bzr upgrade --rich-root-pack (local branch)
(5) work on the code and push to svn branch
(6) bzr upgrade --rich-root-pack bzr+ssh://bzr-playground.gnome.org/bzr/robsta/gtk-css-engine
(7) push to bzr branch fails:

rstaudinger@meqbuq:~/Desktop/Devel/gtk-css-engine$ bzr push bzr+ssh://bzr-playground.gnome.org/bzr/robsta/gtk-css-engine bzr: ERROR: Revision {<email address hidden>} not present in "doc-20080812073847-d210lox1qul689g2-17".

rstaudinger@meqbuq:~/Desktop/Devel/gtk-css-engine$ bzr check
Checking working tree at 'file:///home/rstaudinger/Desktop/Devel/gtk-css-engine/'.
Checking repository at 'file:///home/rstaudinger/Desktop/Devel/gtk-css-engine/'.
bzr: ERROR: exceptions.KeyError: ('tmpl-20080812074428-nyhitml08u65nqqo-1', '<email address hidden>')

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 857, 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 2399, in run
    check_dwim(path, verbose, do_branch=branch, do_repo=repo, do_tree=tree)
  File "/usr/lib/python2.5/site-packages/bzrlib/check.py", line 302, in check_dwim
    result = repo.check()
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 138, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1850, in check
    return self._check(revision_ids)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1854, in _check
    result.check()
  File "/usr/lib/python2.5/site-packages/bzrlib/check.py", line 87, in check
    self.check_weaves()
  File "/usr/lib/python2.5/site-packages/bzrlib/check.py", line 208, in check_weaves
    self.repository.texts, progress_bar=self.progress)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 3226, in check_file_version_parents
    knit_parents = parent_map[key]
KeyError: ('tmpl-20080812074428-nyhitml08u65nqqo-1', '<email address hidden>')

bzr 1.7.1 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'check']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_GB.UTF-8'
plugins:
  launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
  svn /usr/lib/python2.5/site-packages/bzrlib/plugins/svn [0.4.13]
*** 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.
rstaudinger@meqbuq:~/Desktop/Devel/gtk-css-engine$ bzr upgrade --rich-root-pack bzr+ssh://bzr-playground.gnome.org/bzr/robsta/gtk-css-engine