[MERGE] Cherrypick support for annotate merge

Aaron Bentley aaron.bentley at utoronto.ca
Thu Dec 20 02:37:06 GMT 2007


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

Andrew Bennetts wrote:

> +    def _subtract_plans(old_plan, new_plan):
> +        # Can't use patience diff-- C version doesn't work with tuples
> 
> The update to the C version to allow tuples just landed. :)

Yes, and I have gladly updated to use patience again.

> A docstring on this helper that briefly explains the trees it returns
> would be good.

Sure.  Thanks for your review.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHadVR0F+nu1YWqI0RAmC+AJ9H9vNxIRkdgj4mSQ28VeKvK8JKAwCfZU44
1S64ufmBPm40yLJDKp2hGCM=
=BGH2
-----END PGP SIGNATURE-----



More information about the bazaar mailing list