How do you keep track of your Mods/Hacks?

[barnold]

I'm finding it hard to keep up with all the little template changes and code changes I make on my site between vB version. I've tried saving the templates that have been modified locally but it hasn't been the easiest to go back and find my changes. I've started commenting everything I do, so hopefully this will make it easier on the next upgrade.

How do you keep up with what you have changed? Do you have a system that makes it a little less painfull when an upgrade rolls out? Thanks for your help!