How do you manage template changes?

[TechDawgFan]

I've customized several templates be it because of my custom preferences or modifications which have been installed. On several of my upgrades, I've had to revert templates as part of the upgrade, and when I do, these template changes are lost and have to be reproduced. It has not been uncommon for me to 'miss' a customized change in the process.

I was just wondering how other people are managing their template changes and making sure they get them all back in. Do you have a personal file that lists all your customizations? Are you using the template history and comparing the customized to reverted template and adding them in? Other methods?

I'd be really interested in hearing how other people are managing this.

TDF