Re: [python-committers] Misc/NEWS entries added to released versions
Often the NEWS entry ends up being rewritten from the commit message to be more user-focussed description of the change... On Sep 14, 2009 6:33 PM, Georg Brandl g.bra...@gmx.net wrote: Brett Cannon schrieb: brainstorm: It'd be nicer if we could generate the file from another source, perhaps ke... We should just switch to Mercurial :) I've already hacked up a hg extension to automatically fill the commit message with the changes in a NEWS or CHANGELOG file. This works quite well -- you add the short but nice description to NEWS, do hg commit, and the editor pops up where you can either accept the message consisting of only the changes in NEWS, or add some more stuff that's not interesting to users. cheers, Georg -- Thus spake the Lord: Thou shalt indent with four spaces. No more, no less. Four shall be the number of spaces thou shalt indent, and the number of thy indenting shall be four. Eight shalt thou not indent, nor either indent thou two, excepting that thou then proceed to four. Tabs are right out. ___ python-committers mailing list python-committ...@py... ___ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
Re: [python-committers] Misc/NEWS entries added to released versions
On 06.04.2009 00:33, Matthias Klose wrote: While looking at the diffs between the 261 release tags and the 26 branch, I noticed many items in Misc/NEWS appearing in the 2.6.1 or even 2.6 sections. I moved all of these to 2.6.2, after checking some of them, and found all of the checked ones be backported after the 2.6.1 release. Is there anything what could be done to avoid these wrong merges? I plan to check the items on the 3.0 branch soon. done again for the 2.6.3 (2.6 branch) and 3.1.2 (3.1 branch) entries. I didn't check if these were inserted to earlier entries by intent except for the removal of the entry for issue #2522. Matthias ___ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
Re: [python-committers] Misc/NEWS entries added to released versions
Le dimanche 13 septembre 2009 à 13:27 -0700, Brett Cannon a écrit : Right, which is why only the first line would be used. All the other usual detail can be there, just do it on another line. But if that line is longer than 80 characters, your $EDITOR may split it automatically and it'll break the generated NEWS. (either that, or you'll want to split it manually to make editing more comfortable) ___ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
Re: [python-committers] Misc/NEWS entries added to released versions
On 13.09.2009 18:07, Gregory P. Smith wrote: On Sun, Sep 13, 2009 at 8:54 AM, Matthias Klosed...@debian.org wrote: On 06.04.2009 00:33, Matthias Klose wrote: While looking at the diffs between the 261 release tags and the 26 branch, I noticed many items in Misc/NEWS appearing in the 2.6.1 or even 2.6 sections. I moved all of these to 2.6.2, after checking some of them, and found all of the checked ones be backported after the 2.6.1 release. Is there anything what could be done to avoid these wrong merges? I plan to check the items on the 3.0 branch soon. done again for the 2.6.3 (2.6 branch) and 3.1.2 (3.1 branch) entries. I didn't check if these were inserted to earlier entries by intent except for the removal of the entry for issue #2522. Matthias Thanks. One reason this happens is that our NEWS file is very difficult to navigate. svnmerge rarely works on it because the context is often different in the branch file but figuring out which version's section of the bazillion line file you are currently in is very tedious in a text editor. brainstorm: another idea: have a pre-commit hook, which rejects modifications to this file to entries for a released version, which can be overwritten by some keyword in the commit message. Matthias ___ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
Re: [python-committers] Misc/NEWS entries added to released versions
2009/4/5 Matthias Klose d...@debian.org: While looking at the diffs between the 261 release tags and the 26 branch, I noticed many items in Misc/NEWS appearing in the 2.6.1 or even 2.6 sections. I moved all of these to 2.6.2, after checking some of them, and found all of the checked ones be backported after the 2.6.1 release. Is there anything what could be done to avoid these wrong merges? Committers backporting things should be careful to make sure items get in the correct section. I plan to check the items on the 3.0 branch soon. Thanks! -- Regards, Benjamin ___ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
Re: [python-committers] Misc/NEWS entries added to released versions
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Apr 5, 2009, at 6:33 PM, Matthias Klose wrote: While looking at the diffs between the 261 release tags and the 26 branch, I noticed many items in Misc/NEWS appearing in the 2.6.1 or even 2.6 sections. I moved all of these to 2.6.2, after checking some of them, and found all of the checked ones be backported after the 2.6.1 release. Is there anything what could be done to avoid these wrong merges? Thanks for cleaning this up Matthias. I'll have a look later today when I create the 2.6.2c1 release. I'm still planning to start that at about 2200 UTC today. Barry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (Darwin) iQCVAwUBSdoLP3EjvBPtnXfVAQLzfgQAj+IWBhzfYgx/tllElP8yrElAkLqGFDrt O5qbhoQ/aDR51ktJuW19IZxMtQdAqPBDKwd0GVKzjZ6j2Qmt5Hh1a39EzcHev6WZ padVreZbM/FWDc10uqZWTsHBnJwI1KJeWuQM3RgrsHKT1njg22/fT4gEgdaYDnmv eViZRDL8Nl8= =z8yP -END PGP SIGNATURE- ___ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
[python-committers] Misc/NEWS entries added to released versions
While looking at the diffs between the 261 release tags and the 26 branch, I noticed many items in Misc/NEWS appearing in the 2.6.1 or even 2.6 sections. I moved all of these to 2.6.2, after checking some of them, and found all of the checked ones be backported after the 2.6.1 release. Is there anything what could be done to avoid these wrong merges? I plan to check the items on the 3.0 branch soon. Matthias ___ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
