-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 02/02/11 19:28, Antoine Pitrou wrote: >> The merge here is mostly automatic. In fact, if the RM doesn't change >> his/her clone at all, the merge is "null", even if devel repository has >> evolved a lot in the meantime. > > By merge I meant the cherry picking operation itself ("svnmerge").
To be concrete, how many patches went inside 2.7.0 after cutting the "rc1"?. Ideally, the answer should be "a handful". AFAIK, there are issues when you cherry pick patches and then you try to merge back (same patch present in both lines, but no metadata saying so). But that seems an issue with current HG/cherrypick extension, not with an abstract mercurial inability. In fact, python could be a push to improve that in HG. - -- Jesus Cea Avion _/_/ _/_/_/ _/_/_/ j...@jcea.es - http://www.jcea.es/ _/_/ _/_/ _/_/ _/_/ _/_/ jabber / xmpp:j...@jabber.org _/_/ _/_/ _/_/_/_/_/ . _/_/ _/_/ _/_/ _/_/ _/_/ "Things are not so easy" _/_/ _/_/ _/_/ _/_/ _/_/ _/_/ "My name is Dump, Core Dump" _/_/_/ _/_/_/ _/_/ _/_/ "El amor es poner tu felicidad en la felicidad de otro" - Leibniz -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQCVAwUBTUmkz5lgi5GaxT1NAQI3HAP9GJ5bKP6LNkzve9j/VIJM8JDUNecEJ8w7 Sqz6WSG4SLan15kFF/IyMbZoCkGDdDqmm8Ut0WpV5tIjByt4SgIJeLk8FyBM4WgW rEbHocufkF8STL3B/skgODUd10jgnKK1DZtZfv/zYVWsKBlXq8P1pSUTN8EegWwp qlFYAP+slrA= =Ckcz -----END PGP SIGNATURE----- _______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers