Re: [python-committers] Misc/NEWS entries added to released versions

2009-09-14 Thread Alexandre Vassalotti
On Mon, Sep 14, 2009 at 10:05 AM, R. David Murray wrote: > But the problem we are trying to solve is the fact that the NEWS > entries wind up in the _wrong_ section on merges.  Any thoughts > about how to solve that under Mercurial? > Could we add a version tag to each NEWS entry? Or perhaps, we

Re: [python-committers] Misc/NEWS entries added to released versions

2009-09-14 Thread Georg Brandl
R. David Murray schrieb: > On Mon, 14 Sep 2009 at 12:40, Georg Brandl wrote: >> Yes, but still: in many cases they are very similar. >> >> Plus, it's hard to auto-add a NEWS entry from a commit message (because >> you need to determine the right section), while it's easy to pre-fill >> the commit m

Re: [python-committers] Misc/NEWS entries added to released versions

2009-09-14 Thread R. David Murray
On Mon, 14 Sep 2009 at 12:40, Georg Brandl wrote: Yes, but still: in many cases they are very similar. Plus, it's hard to auto-add a NEWS entry from a commit message (because you need to determine the right section), while it's easy to pre-fill the commit message from a NEWS diff. But the prob

Re: [python-committers] Misc/NEWS entries added to released versions

2009-09-14 Thread Antoine Pitrou
Le lundi 14 septembre 2009 à 12:40 +0200, Georg Brandl a écrit : > Yes, but still: in many cases they are very similar. > > Plus, it's hard to auto-add a NEWS entry from a commit message (because > you need to determine the right section), while it's easy to pre-fill > the commit message from a N

Re: [python-committers] Misc/NEWS entries added to released versions

2009-09-14 Thread Georg Brandl
Yes, but still: in many cases they are very similar. Plus, it's hard to auto-add a NEWS entry from a commit message (because you need to determine the right section), while it's easy to pre-fill the commit message from a NEWS diff. Georg Anthony Baxter schrieb: > Often the NEWS entry ends up bei

Re: [python-committers] Misc/NEWS entries added to released versions

2009-09-14 Thread Anthony Baxter
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" wrote: Brett Cannon schrieb: >> brainstorm: >> >> It'd be nicer if we could generate the file from another source, >> perhaps ke...

Re: [python-committers] Misc/NEWS entries added to released versions

2009-09-14 Thread Georg Brandl
Brett Cannon schrieb: >> brainstorm: >> >> It'd be nicer if we could generate the file from another source, >> perhaps keep each releases news in its own file and merge it all >> together at release time? >> >> Or have a NEWS.latest file that contains only updates since the >> previous release (pa

Re: [python-committers] Misc/NEWS entries added to released versions

2009-09-13 Thread Matthias Klose
On 13.09.2009 18:07, Gregory P. Smith wrote: On Sun, Sep 13, 2009 at 8:54 AM, Matthias Klose 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 sectio

Re: [python-committers] Misc/NEWS entries added to released versions

2009-09-13 Thread Antoine Pitrou
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 br

Re: [python-committers] Misc/NEWS entries added to released versions

2009-09-13 Thread Brett Cannon
On Sun, Sep 13, 2009 at 13:26, Antoine Pitrou wrote: > Le dimanche 13 septembre 2009 à 13:15 -0700, Brett Cannon a écrit : >> >> Or simply take the first line of each commit? I mean why do we enter >> it twice? If we have a commit that is unimportant we could come up >> with some convention to mak

Re: [python-committers] Misc/NEWS entries added to released versions

2009-09-13 Thread R. David Murray
On Sun, 13 Sep 2009 at 13:15, Brett Cannon wrote: On Sun, Sep 13, 2009 at 09:07, Gregory P. Smith wrote: 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 ou

Re: [python-committers] Misc/NEWS entries added to released versions

2009-09-13 Thread Antoine Pitrou
Le dimanche 13 septembre 2009 à 13:15 -0700, Brett Cannon a écrit : > > Or simply take the first line of each commit? I mean why do we enter > it twice? If we have a commit that is unimportant we could come up > with some convention to make it as such or simply have the comment > start with a blan

Re: [python-committers] Misc/NEWS entries added to released versions

2009-09-13 Thread Brett Cannon
On Sun, Sep 13, 2009 at 09:07, Gregory P. Smith wrote: > On Sun, Sep 13, 2009 at 8:54 AM, Matthias Klose 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 t

Re: [python-committers] Misc/NEWS entries added to released versions

2009-09-13 Thread Gregory P. Smith
On Sun, Sep 13, 2009 at 8:54 AM, Matthias Klose 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.

Re: [python-committers] Misc/NEWS entries added to released versions

2009-09-13 Thread Matthias Klose
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 bac

Re: [python-committers] Misc/NEWS entries added to released versions

2009-04-06 Thread Barry Warsaw
-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 check

Re: [python-committers] Misc/NEWS entries added to released versions

2009-04-06 Thread Benjamin Peterson
2009/4/5 Matthias Klose : > 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