-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 08/11/11 19:51, Terry Reedy wrote: > If a bug is fixed in 3.2.latest, then it will not be new in 3.3.0, > so perhaps it should not be added there. NEWS could just refer back > to previous sections. Then 3.3.0 News would only be new features > and the occasional ambiguous item not fixed before.
I am confused. My usual usage case is this: 1. I fix something in 3.2. 2. I merge that fix into 3.3. Everything goes smooth except Misc/NEWS. 3. Recover the original 3.3 Misc/NEWS, and add manually what I added to the 3.2 Misc/NEWS. Mark the file as "resolved" and commit. I would like to avoid (3). A custom merge script is an option, but seems complicated and error prone. I have the feeling that structuring Misc/NEWS in the right way could solve it automatically. Something like adding patches to be up-ported/merged at the end of the section, 3.3 only patches be added at the beginning, so they don't conflict. A bit of discipline and, voila, automatic flawless merges! :-) - -- 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/ iQCVAwUBTrr87plgi5GaxT1NAQL5GgQAnKsWb4TM1oXXo4Dg84XFIHoKpxQQwRWq oKFIaddNOaZ3wp+ccR0G2aoi+LX2BrsEn3sBL7RXRXVFPludGDvonWcvHar/2DLw E52jDytiMd0gED5TkyqPdck3s6NhUCaZz1qfncI9jHkb2/rznXiBK0mLD+suRleu f+AQ6yoPD2o= =ruC4 -----END PGP SIGNATURE----- _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
