Comment 1 for bug 733991

Revision history for this message
Jelmer Vernooij (jelmer) wrote : Re: [Bug 733991] [NEW] bzr log --include-merges bombs

On Sat, 2011-03-12 at 19:53 +0000, Denys Duchier wrote:
> Public bug reported:
>
> I "bzr branch'ed" off a bzr/svn branch, make a mod and a commit, then merged it back into the bzr/svn branch.
> now "bzr log" bombs when I want to see merges.
>
> bzr: ERROR: bzrlib.errors.NoSuchRevision:
> <bzrlib.plugins.svn.cache.tdbcache.TdbRevisionIdMapCache object at
> 0x9a81bcc> has no revision 1
>
> Traceback (most recent call last):
> File "/home/denys/lib/python/bzrlib/commands.py", line 926, in exception_to_return_code
> return the_callable(*args, **kwargs)
> File "/home/denys/lib/python/bzrlib/commands.py", line 1126, in run_bzr
> ret = run(*run_argv)
> File "/home/denys/lib/python/bzrlib/commands.py", line 691, in run_argv_aliases
> return self.run(**all_cmd_args)
> File "/home/denys/lib/python/bzrlib/commands.py", line 713, in run
> return self._operation.run_simple(*args, **kwargs)
> File "/home/denys/lib/python/bzrlib/cleanup.py", line 135, in run_simple
> self.cleanups, self.func, *args, **kwargs)
> File "/home/denys/lib/python/bzrlib/cleanup.py", line 165, in _do_with_cleanups
> result = func(*args, **kwargs)
> File "/home/denys/lib/python/bzrlib/commands.py", line 1141, in ignore_pipe
> result = func(*args, **kwargs)
> File "/home/denys/lib/python/bzrlib/builtins.py", line 2511, in run
> Logger(b, rqst).show(lf)
> File "/home/denys/lib/python/bzrlib/log.py", line 343, in show
> self._show_body(lf)
> File "/home/denys/lib/python/bzrlib/log.py", line 367, in _show_body
> for lr in generator.iter_log_revisions():
> File "/home/denys/lib/python/bzrlib/log.py", line 405, in iter_log_revisions
> for revs in revision_iterator:
> File "/home/denys/lib/python/bzrlib/log.py", line 933, in _make_revision_objects
> revisions = repository.get_revisions(revision_ids)
> File "/home/denys/.bazaar/plugins/svn/repository.py", line 994, in get_revisions
> return map(self.get_revision, revision_ids)
> File "/home/denys/.bazaar/plugins/svn/repository.py", line 987, in get_revision
> revmeta, mapping = self._get_revmeta(revision_id)
> File "/home/denys/.bazaar/plugins/svn/repository.py", line 978, in _get_revmeta
> (uuid, branch, revnum), mapping = self.lookup_bzr_revision_id(revision_id)
> File "/home/denys/.bazaar/plugins/svn/repository.py", line 1062, in lookup_bzr_revision_id
> return self.revmap.get_branch_revnum(revid, layout, project)
> File "/home/denys/.bazaar/plugins/svn/revids.py", line 249, in get_branch_revnum
> raise e
> NoSuchRevision: <bzrlib.plugins.svn.cache.tdbcache.TdbRevisionIdMapCache object at 0x9a81bcc> has no revision 1
Are you running "bzr log" in the subversion checkout ? What's the full
command you're running?

 status incomplete

Cheers,

Jelmer