bzr merge failure

[John Arbash Meinel]

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


...

> 
> 
>> I would be interested in whether you can reproduce this if you start a
>> new branch in 2a format.  I think it should work there.
> 
> Yes, a 2a branch seems to work correctly - diff, status, and merge 
> all work across that problematic revision just fine.
> 
> How ready-to-use is 2a? It sounds like I may not be able get this
> changeset in without upgrading to it - is that likely to cause me
> pain down the road?
> 
> Thanks for your help.
> 
> Cheers,
> Gavin

Well, Launchpad is using --2a as its format, and we are trying to make
it the default format in the next release. So stable enough.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkpy7iUACgkQJdeBCYSNAANcdwCeLWYYwrj9axBeJFVeN3F0WV/m
rVwAnA7328MWDIQH3zGO2I+Z++nDo9z6
=vezo
-----END PGP SIGNATURE-----