Thanks Eloy. That sounds like a nice recipe. I will try it out within next few weeks and see whether it is as simple as it sounds upon initial reading.
I have no feelings about CVS and I don't know whether I will love git as much as you and other developers do. I doubt I will use it more often then I use CVS, which, as a site administrator, I use about twice a year, and that normally involves copy/paste of a couple commands which I store in a file.