ERROR: bzrlib.errors.NoSuchRevision

[ChriS]

(This may be related to bug 233964 as it is as an attempt to work around it that I got this error.)

Steps to reproduce (done with bzr 1.6b3 on python 2.5.2 and bzr-svn 0.4.11exp0) :
untar the attached file
$ cd main
$ bzr merge https://pa-do.svn.sourceforge.net/svnroot/pa-do/trunk
Nothing to do.
$ bzr missing https://pa-do.svn.sourceforge.net/svnroot/pa-do/trunk
You have 3 extra revision(s):
...
$ cd ..
$ svn co https://pa-do.svn.sourceforge.net/svnroot/pa-do/trunk
$ cd main
$ bzr push ../trunk/
bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified.
  # Hug!!!
$ cd ../trunk/
$ bzr merge ../main/
using experimental bzr-svn mappings; output may change between revisions
bzr: ERROR: bzrlib.errors.NoSuchRevision: <bzrlib.plugins.svn.revids.RevisionIdMapCache object at 0x1b2cb10> has no revision <email address hidden>

Traceback (most recent call last):
  File "/home/devel/bzr/bzr.dev/bzrlib/commands.py", line 857, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/devel/bzr/bzr.dev/bzrlib/commands.py", line 797, in run_bzr
    ret = run(*run_argv)
  File "/home/devel/bzr/bzr.dev/bzrlib/commands.py", line 499, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/devel/bzr/bzr.dev/bzrlib/builtins.py", line 2926, in run
    location, revision, remember, possible_transports, pb)
  File "/home/devel/bzr/bzr.dev/bzrlib/builtins.py", line 3027, in _get_merger_from_branch
    other_revision_id, base_revision_id, other_branch, base_branch)
  File "/home/devel/bzr/bzr.dev/bzrlib/merge.py", line 189, in from_revision_ids
    merger.set_other_revision(other, other_branch)
  File "/home/devel/bzr/bzr.dev/bzrlib/merge.py", line 330, in set_other_revision
    self._maybe_fetch(other_branch, self.this_branch, self.other_rev_id)
  File "/home/devel/bzr/bzr.dev/bzrlib/merge.py", line 347, in _maybe_fetch
    target.fetch(source, revision_id)
  File "/home/devel/bzr/bzr.dev/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/home/devel/bzr/bzr.dev/bzrlib/branch.py", line 271, in fetch
    pb=nested_pb)
  File "/home/devel/bzr/bzr.dev/bzrlib/repository.py", line 930, in fetch
    return inter.fetch(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts)
  File "/home/trch/.bazaar.dev/plugins/svn/commit.py", line 880, in fetch
    self.copy_content(revision_id=revision_id, pb=pb)
  File "/home/trch/.bazaar.dev/plugins/svn/commit.py", line 866, in copy_content
    (bp, _, _) = self.target.lookup_revision_id(parent_revid)
  File "/home/trch/.bazaar.dev/plugins/svn/repository.py", line 593, in lookup_revision_id
    return self.get_revmap().get_branch_revnum(revid, layout)
  File "/home/trch/.bazaar.dev/plugins/svn/revids.py", line 170, in get_branch_revnum
    raise e
NoSuchRevision: <bzrlib.plugins.svn.revids.RevisionIdMapCache object at 0x1b2cb10> has no revision <email address hidden>

bzr 1.6b3 on python 2.5.2 (linux2)
arguments: ['/home/devel/bzr/bzr.dev/bzr', 'merge', '../main/']
encoding: 'ISO-8859-1', fsenc: 'ISO-8859-1', lang: 'en_US'
plugins:
  bzrtools /home/trch/.bazaar.dev/plugins/bzrtools [1.6.0]
  gtk /usr/lib/python2.5/site-packages/bzrlib/plugins/gtk [0.94.0]
  launchpad /home/devel/bzr/bzr.dev/bzrlib/plugins/launchpad [unknown]
  rebase /usr/lib/python2.5/site-packages/bzrlib/plugins/rebase [0.3.0]
  svn /home/trch/.bazaar.dev/plugins/svn [0.4.11exp0]