Re: [Python-Dev] [Python-checkins] (2.6): Issue #11424: Fix bug in determining child loggers.
On Thu, Mar 10, 2011 at 18:47, Nick Coghlan ncogh...@gmail.com wrote: On Thu, Mar 10, 2011 at 5:41 PM, Vinay Sajip vinay_sa...@yahoo.co.uk wrote: - Original Message From: Éric Araujo mer...@netwok.org From what I understand, we're supposed to forward-port in Mercurial, Correct, but only in maintained branches, not security-mode branches. Well, I saw this recent mail from Antoine: http://mail.python.org/pipermail/python-dev/2011-March/108766.html where he mentioned - on one hand: 2.5 - 2.6 - 2.7 (if you still want to maintain 2.5) - on the other hand: 3.1 - 3.2 - default and perhaps misunderstood. I was assuming that there wouldn't be any 2.6 releases from Mercurial, perhaps that assumption was unwarranted. Also, the section on forward-porting in the Dev Guide says it should be applied to the oldest branch applicable and this could be interpreted to mean applicable based on the content of the branch, rather than according to release policy. It's the intersection: if the change applies to the content of that branch and that branch is still maintained, then start there. So security fixes start further back than ordinary bug fixes. This should be reverted in 2.6, with the dummy merge to prevent inadvertent reversion in 2.7. Just to be clear on this, so people don't think this is more complicated than it needs to be: you can still *develop* a patch based on 2.5, even commit it to your local repository, and then only push it to 2.6 or 2.7 and later. You don't have to consider where the patch should go beforehand. -- Thomas Wouters tho...@python.org Hi! I'm a .signature virus! copy me into your .signature file to help me spread! ___ 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
Re: [Python-Dev] [Python-checkins] (2.6): Issue #11424: Fix bug in determining child loggers.
Hi, changeset: 68315:b9d76846bb1c branch: 2.6 parent: 68264:50166a4bcfc6 user:Vinay Sajip vinay_sa...@yahoo.co.uk date:Mon Mar 07 15:02:11 2011 + summary: Issue #11424: Fix bug in determining child loggers. This does not look like a security bug, and is therefore not suitable for 2.6. I’d like to know what we should do about this: just ignore it and not import it into Subversion, or revert it in Mercurial too? Regards ___ 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
Re: [Python-Dev] [Python-checkins] (2.6): Issue #11424: Fix bug in determining child loggers.
On Thu, 10 Mar 2011 21:29:59 +0100 Éric Araujo mer...@netwok.org wrote: Hi, changeset: 68315:b9d76846bb1c branch: 2.6 parent: 68264:50166a4bcfc6 user:Vinay Sajip vinay_sa...@yahoo.co.uk date:Mon Mar 07 15:02:11 2011 + summary: Issue #11424: Fix bug in determining child loggers. This does not look like a security bug, and is therefore not suitable for 2.6. I’d like to know what we should do about this: just ignore it and not import it into Subversion, or revert it in Mercurial too? If you revert (backout) it in Mercurial, you should be careful to dummy-merge the backout in 2.7 (so that the backout doesn't get accidentally propagated by someone else doing a merge from 2.6 to 2.7). Regards Antoine. ___ 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
Re: [Python-Dev] [Python-checkins] (2.6): Issue #11424: Fix bug in determining child loggers.
From what I understand, we're supposed to forward-port in Mercurial, which is why I started with 2.6 (the bugfix wasn't applicable to 2.5). So we don't need to import into Subversion, but I see no point in reverting it in Mercurial. Regards, Vinay Sajip - Original Message From: Éric Araujo mer...@netwok.org To: python-dev@python.org; Friendly Uncle ba...@python.org; Vinay Sajip vinay_sa...@yahoo.co.uk Sent: Thu, 10 March, 2011 20:29:59 Subject: Re: [Python-Dev] [Python-checkins] (2.6): Issue #11424: Fix bug in determining child loggers. Hi, changeset: 68315:b9d76846bb1c branch: 2.6 parent: 68264:50166a4bcfc6 user:Vinay Sajip vinay_sa...@yahoo.co.uk date:Mon Mar 07 15:02:11 2011 + summary: Issue #11424: Fix bug in determining child loggers. This does not look like a security bug, and is therefore not suitable for 2.6. I’d like to know what we should do about this: just ignore it and not import it into Subversion, or revert it in Mercurial too? Regards ___ 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
Re: [Python-Dev] [Python-checkins] (2.6): Issue #11424: Fix bug in determining child loggers.
Hi, From what I understand, we're supposed to forward-port in Mercurial, Correct, but only in maintained branches, not security-mode branches. which is why I started with 2.6 (the bugfix wasn't applicable to 2.5). As I said in my first message: This does not look like a security bug, and is therefore not suitable for 2.6. I don’t know if Barry will make the next 2.6 releases from Subversion or Mercurial; anyway, bug fixes should not go into 2.6. Regards ___ 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
Re: [Python-Dev] [Python-checkins] (2.6): Issue #11424: Fix bug in determining child loggers.
- Original Message From: Éric Araujo mer...@netwok.org From what I understand, we're supposed to forward-port in Mercurial, Correct, but only in maintained branches, not security-mode branches. Well, I saw this recent mail from Antoine: http://mail.python.org/pipermail/python-dev/2011-March/108766.html where he mentioned - on one hand: 2.5 - 2.6 - 2.7 (if you still want to maintain 2.5) - on the other hand: 3.1 - 3.2 - default and perhaps misunderstood. I was assuming that there wouldn't be any 2.6 releases from Mercurial, perhaps that assumption was unwarranted. Also, the section on forward-porting in the Dev Guide says it should be applied to the oldest branch applicable and this could be interpreted to mean applicable based on the content of the branch, rather than according to release policy. Regards, Vinay Sajip ___ 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
Re: [Python-Dev] [Python-checkins] (2.6): Issue #11424: Fix bug in determining child loggers.
On Thu, Mar 10, 2011 at 5:41 PM, Vinay Sajip vinay_sa...@yahoo.co.uk wrote: - Original Message From: Éric Araujo mer...@netwok.org From what I understand, we're supposed to forward-port in Mercurial, Correct, but only in maintained branches, not security-mode branches. Well, I saw this recent mail from Antoine: http://mail.python.org/pipermail/python-dev/2011-March/108766.html where he mentioned - on one hand: 2.5 - 2.6 - 2.7 (if you still want to maintain 2.5) - on the other hand: 3.1 - 3.2 - default and perhaps misunderstood. I was assuming that there wouldn't be any 2.6 releases from Mercurial, perhaps that assumption was unwarranted. Also, the section on forward-porting in the Dev Guide says it should be applied to the oldest branch applicable and this could be interpreted to mean applicable based on the content of the branch, rather than according to release policy. It's the intersection: if the change applies to the content of that branch and that branch is still maintained, then start there. So security fixes start further back than ordinary bug fixes. This should be reverted in 2.6, with the dummy merge to prevent inadvertent reversion in 2.7. Cheers, Nick. -- Nick Coghlan | ncogh...@gmail.com | Brisbane, Australia ___ 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
Re: [Python-Dev] [Python-checkins] (2.6): Issue #11424: Fix bug in determining child loggers.
Hello, changeset: 68315:b9d76846bb1c branch: 2.6 parent: 68264:50166a4bcfc6 user:Vinay Sajip vinay_sa...@yahoo.co.uk date:Mon Mar 07 15:02:11 2011 + summary: Issue #11424: Fix bug in determining child loggers. This does not look like a security bug, and is therefore not suitable for 2.6. Hook authors: including the local revision number in the -checkins messages is misleading and possibly harmful. Regards ___ 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
Re: [Python-Dev] [Python-checkins] (2.6): Issue #11424: Fix bug in determining child loggers.
On Mon, 07 Mar 2011 19:29:51 +0100 Éric Araujo mer...@netwok.org wrote: Hello, changeset: 68315:b9d76846bb1c branch: 2.6 parent: 68264:50166a4bcfc6 user:Vinay Sajip vinay_sa...@yahoo.co.uk date:Mon Mar 07 15:02:11 2011 + summary: Issue #11424: Fix bug in determining child loggers. This does not look like a security bug, and is therefore not suitable for 2.6. Hook authors: including the local revision number in the -checkins messages is misleading and possibly harmful. We're using the stock template output from Mercurial (the one you get when typing hg log -v -r somechangeset). Another issue is that the files section in merges doesn't show all affected files. Patches welcome (the hooks are in hg.python.org/hooks). Regards Antoine. ___ 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
Re: [Python-Dev] [Python-checkins] (2.6): Issue #11424: Fix bug in determining child loggers.
On 07.03.2011 19:29, Éric Araujo wrote: Hello, changeset: 68315:b9d76846bb1c branch: 2.6 parent: 68264:50166a4bcfc6 user:Vinay Sajip vinay_sa...@yahoo.co.uk date:Mon Mar 07 15:02:11 2011 + summary: Issue #11424: Fix bug in determining child loggers. This does not look like a security bug, and is therefore not suitable for 2.6. Hook authors: including the local revision number in the -checkins messages is misleading and possibly harmful. In this case, it's not really a local revision number, but the revision number in the authoritative upstream repository. Georg ___ 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
