Comment 5 for bug 393905

Revision history for this message
Jelmer Vernooij (jelmer) wrote : Re: [Bug 393905] Re: bzr blame fail with KeyError in _expand_annotations

On Fri, 2010-10-01 at 09:15 +0000, Francis Devereux wrote:
> On 1 Oct 2010, at 09:58, Jelmer Vernooij wrote:
>
> > Sorry, that sounds a bit harsh. I meant to say I can /no longer/
> > reproduce this bug with current versions of bzr-svn/bzr. I was able to
> > reproduce at least one of the two ghost issues you reported earlier.
>
> Does this mean that current versions of bzr-svn/bzr can deal with ghost
> revisions or they don't create them any more? If it means that they
> don't create them any more but still can't deal with them being present
> is there any way of fixing existing repositories that contain ghost
> revisions?
>
> Also, by "current versions" do you mean "current in-development
> versions" or "current releases i.e. bzr 2.2.1 / bzr-svn 1.0.4"?
I've only tried with bzr 2.2.1 / bzr-svn trunk, but I don't think we've
made any chance to bzr-svn trunk since 1.0.4 that would affect this.

The only thing I've tried is Philip's script, which creates a svn
repository that introduces ghosts and then attempts to clone from it and
annotate against it in one go. I don't think we can handle existing
repositories with (these) ghosts. The ghosts that bzr-svn creates are
now more like the ghosts that Bazaar already had to deal with earlier,
which it handles a fair bit better.

You should be able to "fix" your existing repositories to work around
this problem by creating a new shared repository and before cloning any
of your existing branches into it doing a fresh clone from Subversion
into the shared repository, then fetching from your existing branches.
Bazaar will not fetch revisions again after it has fetched them once.

Cheers,

Jelmer