[Python-Dev] RE: [Python-checkins] CVS: python/dist/src/Tools/idle CallTipWindow.py,1.2,1.3 CallTips.py,1.7,1.8 ClassBrowser.py,1.11,1.12 Debugger.py,1.14,1.15 Delegator.py,1.2,1.3 FileList.py,1.7,1.8 FormatParagraph.py,1.8,1.9 IdleConf.py,1.5,1.6 IdleHistory.py,1.3,1

[Tim Peters]

[an anonymous developer panics, after Tim "reindent"s the IDLE dir]

> Oh no!
>
> I have a whole slew of changes to IDLE sitting in my work directory.
> If I do an update half of these will turn into merge conflicts. :-(
>
> Don't worry, I'll get over it.

I imagine this will pop up from time to time until everything is normalized.
If it's about to burn you, run reindent.py on the affected directory
*before* you update ("python redindent.py -v .").  That will make all the
same changes to your local versions as were checked in, modulo the rare
hand-edit (of which there were none in the IDLE directory).