bzr merge fails part way

[Martin Pool]

On 6/1/07, John Paulett <jp at jhcore.com> wrote:
> Attached is the command output.  I was trying to merge my branch
> (https://code.launchpad.net/~jp-jhcore/vcs-frenzy/trunk-jp) with the
> main trunk (https://code.launchpad.net/~petesavage/vcs-frenzy/trunk).
>
> I'm still trying to get the hang of bazaar, so it is possible that it is
> my fault.

Hi John,

I was trying to reproduce this but
https://code.launchpad.net/~jp-jhcore/vcs-frenzy/trunk-jp doesn't seem
to exist any more.  It is possible your bug is fixed in Bazaar 0.16 or
will be fixed in 0.17rc1; could you please try that and let us know,
or post the correct url for your branch?

Thanks,
-- 
Martin