I think the following command produce nice result for CVS:
indent -kr -nlp filename
It will help to work with diff in future.
Do you agree?
--
Best regards
_/_/ _/_/ Ruslan Popov
_/ _/ _/_/ _/ _/ Mobile: +7 (916) 926-12-05
_/ _/ _/ _/ _/ _/ Site: http://rad.xtalk.msk.su/
_/_/ _/ _/ _/ _/ E-mail: radz at yandex.ru
_/ _/ _/_/_/ _/_/ Home, Moscow, Russia