[Python-checkins] r54415 - python/trunk/Python/ast.c

[Georg Brandl]

Thomas Wouters schrieb:
> 
> 
> On 3/17/07, *Georg Brandl* <g.brandl at gmx.net <mailto:g.brandl at gmx.net>> 
> wrote:
> 
>     jeremy.hylton schrieb:
>      > Author: jeremy.hylton
>      > Date: Fri Mar 16 16:59:47 2007
>      > New Revision: 54415
>      >
>      > Modified:
>      >    python/trunk/Python/ast.c
>      > Log:
>      > Clean up formatting of this file.
>      >
>      > The file should now follow PEP 7, except that it uses 4 space indents
>      > (in the style of Py3k).  This particular code would be really hard to
>      > read with the regular tab idents.
>      >
>      > Other changes:
>      >  - reflow long lines
>      >  - change multi-line conditionals to have test at end of line
> 
>     This should be done in the p3yk branch too (perhaps after a merge
>     until before
>     the reformatting), or else merging changes will be a PITA. 
> 
> 
> Eh, no, it's much better to do it in the trunk only (and let me merge 
> it.). Merging from py3k to trunk isn't normally done, so doing it in one 
> case would be painful. Any change that applies to both the trunk and 
> py3k should be done in the trunk.

Okay, thanks for clarifying. I thought that since the files are already
different in the two branches merging these changes would be more work than
selecting the needed revisions to merge.

 > (I'm working on setting up a sane way to do backports of py3k features to 2.6,
 > using bazaar or mercurial, but that's a few weeks away still. In the mean time,
 > if you want to do backports of py3k features, please do them in a branch and
 > don't actually commit them to the trunk, thanks :-)

Ok. Last time I asked, I was told to commit them to the trunk ;)

Georg