Re: [Python-Dev] Committing a bug fix

2015-09-28 Thread Terry Reedy
On 9/28/2015 7:05 PM, Martin Panter wrote: On 28 September 2015 at 22:31, Terry Reedy wrote: . . . it may have merged in the wrong place, such as putting a things into the 3.5.1 section of 3.6 NEWS, which should not be there. Since you mentioned this and I also noticed this, can I ask why the

Re: [Python-Dev] Committing a bug fix

2015-09-28 Thread Eric V. Smith
At the top of the file in the default branch, I see: What's New in Python 3.6.0 alpha 1? Which has a few things in it. Eric. On 9/28/2015 7:30 PM, Guido van Rossum wrote: > It used to be tradition to keep old news sections. Looks like the last > time we cleared it out was for 3.4.0. > > But it

Re: [Python-Dev] Committing a bug fix

2015-09-28 Thread Guido van Rossum
It used to be tradition to keep old news sections. Looks like the last time we cleared it out was for 3.4.0. But it's suspicious there's no section for 3.6 at all. Unless... 3.6 has nothing new yet, it's all just bugfixes ported from 3.5? On Mon, Sep 28, 2015 at 4:05 PM, Martin Panter wrote: >

Re: [Python-Dev] Committing a bug fix

2015-09-28 Thread Martin Panter
On 28 September 2015 at 22:31, Terry Reedy wrote: > . . . it may have merged in the wrong place, such as putting a things into the > 3.5.1 section of 3.6 NEWS, which should not be there. Since you mentioned this and I also noticed this, can I ask why the 3.5.1 section is there, if it isn’t meant

Re: [Python-Dev] Committing a bug fix

2015-09-28 Thread Terry Reedy
On 9/28/2015 1:12 PM, Alexander Belopolsky wrote: On Mon, Sep 28, 2015 at 4:13 AM, Terry Reedy mailto:tjre...@udel.edu>> wrote: Normal one specified in devguide: commit 3.4, merge 3.5, merge 3.6, That's exactly what I did at fist, but apparently while I was doing this, another commit was

Re: [Python-Dev] Committing a bug fix

2015-09-28 Thread Brett Cannon
See http://bugs.python.org/issue18967 if you want to join the discussion on how to solve Misc/NEWS potentially in the short term (long term we have a plan once someone has time to hack on the issue tracker). On Mon, 28 Sep 2015 at 10:12 Alexander Belopolsky < alexander.belopol...@gmail.com> wrote:

Re: [Python-Dev] Committing a bug fix

2015-09-28 Thread Alexander Belopolsky
On Mon, Sep 28, 2015 at 4:13 AM, Terry Reedy wrote: > Normal one specified in devguide: commit 3.4, merge 3.5, merge 3.6, That's exactly what I did at fist, but apparently while I was doing this, another commit was pushed to all three branches. To recover, I did a series of hg update 3.x; hg

Re: [Python-Dev] Committing a bug fix

2015-09-28 Thread Terry Reedy
On 9/28/2015 2:56 AM, Martin Panter wrote: Also @Terry, not sure on your workflow, Normal one specified in devguide: commit 3.4, merge 3.5, merge 3.6, except I do it with TortoiseHG Workbench GUI. > but you might have been able to avoid pushing your 3.4 commits. You might have been able to

Re: [Python-Dev] Committing a bug fix

2015-09-28 Thread Martin Panter
On 28/09/2015, Terry Reedy wrote: > You neglected to forward merge a 3.4-3.4 merge and a 3.5-3.5 merge. I > failed to notice the first and added a commit, and then backed it out, > when I could not merge forward due to merge conflicts with your commits. > Perhaps you just need to null-merge the

Re: [Python-Dev] Committing a bug fix

2015-09-27 Thread Terry Reedy
On 9/27/2015 10:05 PM, Alexander Belopolsky wrote: On Sun, Sep 27, 2015 at 9:12 PM, R. David Murray mailto:rdmur...@bitdance.com>> wrote: .. 3.4, 3.5, and default. 3.4.4rc1 is due out next Sunday. Only emergency patches after that. Thanks. Maybe you can help me to make hg cooper

Re: [Python-Dev] Committing a bug fix

2015-09-27 Thread Alexander Belopolsky
On Sun, Sep 27, 2015 at 9:12 PM, R. David Murray wrote: > .. > > 3.4, 3.5, and default. > > Thanks. Maybe you can help me to make hg cooperate. I made commits to 3.4, 3.5, and default and tried to push, but hg complains: remote has heads on branch '3.4' that are not known locally: 46aaff5e894

Re: [Python-Dev] Committing a bug fix

2015-09-27 Thread R. David Murray
On Sun, 27 Sep 2015 21:08:02 -0400, Alexander Belopolsky wrote: > Can someone remind me which branches regular (non-security) bug fixes go to > these days? See for context. 3.4, 3.5, and default. (3.4 for only another few weeks.) --David ___

[Python-Dev] Committing a bug fix

2015-09-27 Thread Alexander Belopolsky
Can someone remind me which branches regular (non-security) bug fixes go to these days? See for context. ___ Python-Dev mailing list Python-Dev@python.org https://mail.python.org/mailman/listinfo/python-dev Unsubscribe