bzr merge fails part way

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGZpvt0F+nu1YWqI0RAkaGAJ48bvefgAi+zPXNmeDkb1VFY8MsMwCdEVIX
Q4srIlPRGCUNEUcb2VJlyfk=
=5PfQ
-----END PGP SIGNATURE-----