Sounds like CVS is your answer. It allows you to syncronize many working copies and has conflict resolution stuff as well.

Also, it handles archiving depreciated scripts: they go into the attic and you don't see them unless you request them.

Also, backing up your code is easy a tar zcvf `date +%Y-%m-%H-%M-%S`.tar.gz $CVSROOT in cron will automagically back up your whole repository. Chances are this will fit onto a floppy for a long time.

Pserver can be a bit wierd to set up. Also, be careful with win32 and it's case insensitive filesystem.

When I code at home, I have a local cvs repository (no pserver) as I only have one box to worry about. It works well for what I do.