[Python-Dev] Reindenting the C code base?

Scott Dial scott+python-dev at scottdial.com
Mon Dec 15 22:25:24 CET 2008


Guido van Rossum 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.

Like "svn blame", you can use "svn merge -x -w" to avoid merging
whitespace changes. However, svnmerge.py does not support any of these
command-line flags being passed along to the svn command-line. It should
be pretty easy to hack in, if it was desirable.

-Scott

-- 
Scott Dial
scott at scottdial.com
scodial at cs.indiana.edu


More information about the Python-Dev mailing list