Tree Transform passing all tests, plus abuse

Robert Collins robertc at robertcollins.net
Sun Feb 12 21:34:35 GMT 2006


On Fri, 2006-02-10 at 15:51 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Hi all,
> 
> The Tree Transform code is now passing all tests.  That includes the
> previously changeset-oriented test_mege_core tests, which I've now
> ported over to it.
> 
> I have also subjected it to abusive merges, (like merge -r 5..100 to
> bzr.dev), and added tests and fixes for the problems this revealed.  It
> now handles these abusive cases better than the existing merge code.
> 
> I think it is pretty much ready for prime time.

This is excellent. I will review it once I finish the 'merge
data-changing features sprint' I'm currently on, if its still unreviewed
then.

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060213/08256f69/attachment.pgp 


More information about the bazaar mailing list