[eluser]Jim OHalloran[/eluser]
I'll second thepyromaniac's suggestion... It's Subversion all the way for me. I run both dev and production ciopies as Subversion working copies. Make changes in your working copy.commit to subversion, update the server's working copy. Make changes on the server? No worries, jut commit those to subversion and update your dev copy.
Jim.
