On Mon, Dec 15, 2008 at 3:59 PM, Guido van Rossum <gu...@python.org> wrote: > Aha! A specific file. I'm supportive of fixing that specific file. Now > if you can figure out how to do it and still allow merging between 2.6 > and 3.0 that would be cool. >
Here's the simplest solution I thought so far to allow smooth merging subsequently. First, fix the 2.6 version with 4-space indent. Over a third of the file is already using spaces for indentation, so I don't think losing consistency is a big deal. Then, block the trunk commit with svnmerge to prevent it from being merged back to the py3k branch. Finally, fix the 3.0 version. -- Alexandre _______________________________________________ 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
