Comment 5 for bug 250480

Am Mittwoch, den 23.07.2008, 01:59 +0000 schrieb Robert Collins:
> On Wed, 2008-07-23 at 01:12 +0000, Jelmer Vernooij wrote:
> >
> > What's the exact command that is failing? running "bzr missing" in a
> > copy of http://bzr-playground.gnome.org/%7Ejstowers/conduit/devel/
> > against the trunk of conduit works fine here.
>
> bzr branch http://bzr-playground.gnome.org/~jstowers/conduit/devel 1
> bzr branch http://www.johnstowers.co.nz/bzr/test-bzr-conduit 2
> cd 1
> bzr merge ../2
> *boom*
> cd ../2
> bzr merge ../1
> *boom*
The particular revision it is complaining about being missing is a ghost
revision (right-hand side so not actually fetchable from svn) so it
seems alright that is is not actually able to find that text.

The first merge command above seems to work for me as long as I fetch
ghosts first:

cd 1
bzr fetch-ghosts ../2
bzr merge ../2

I'm surprised that is necessary though.

Cheers,

Jelmer

--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>