bzr merge fails part way

[John Paulett]

Sorry about that, I changed my launchpad account name last night.  The
branch is available at
https://code.launchpad.net/~johnpaulett/vcs-frenzy/trunk-jp

Sorry and thanks for the help.  I will try to use a newer version of bazaar.

John

Aaron Bentley wrote:
> Martin Pool wrote:
> 
>> 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?
> 
> I merged a fix for this last night: "Re: [MERGE] Merge handles
> renamed-and-deleted files correctly (Bug #110279)"
> 
> Aaron