-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 28/04/10 12:17, Antoine Pitrou wrote: > Le mercredi 28 avril 2010 à 04:37 +0200, Jesus Cea a écrit : >> That is, patch 2.7 and "push" those changes to 3.x, undoing the >> unnecesary patches with a simple "backout". > > Good point. I haven't thought of the possibility of using "hg backout". > However, those bugfixes must also be applied (usually) to 3.1, which > makes the workflow graph a bit uncertain: > (3.1 -> 2.7) and (3.1 -> 3.x)?
Yes, I would "push": 2.6 -> 2.7 -> 3.1 -> 3.x Versions in the right must include patches done for the versions in the left. Also, versions more in the left change less. I am not formally proposing this workflow, but it would leverage the merge excellence of Mercurial. The bad thing about "backout" is the polution of the repository history. Another option would be to push the change and do a "null merge", were we actually "cancel" the change. But that would "lie" in the history and could require a fake commit in the "tip" to have two heads to merge. Looking in this way, the "backout" path seems better, because it documents both "we have considered this patch" as the outcome "but we don't need it in this repository". - -- 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.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQCVAwUBS9hp8Jlgi5GaxT1NAQLOzAP+KBx0UIrRtXkPBDMujm3L8pEhGzmBFdAF fIasqcyMMX/Z5ZpNFwIwQ/pcf4vgk8J8fbhV+DUJb4J7dHs8DMf/UZv0Xt/JXl88 IZOC23CwYSTcc3jp69frRdC/KUznmYRWyo5rzJ89R+vl1YDXD5tZPX8djv+6Aoew L8BxKJ9rUvw= =KUEr -----END PGP SIGNATURE----- _______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
