I think Git is ideal for the environment as you've described it. If you don't want to get too complex for now just start with getting all the developers to use Git with a central repo.
I think a question you need to ask yourself is how you want to deliver your files into production. As you said earlier, your test server looks like production, and you should deploy to test the same way you plan to deploy to production to verify that is working as well. If you want to deliver a package (RPM, PIP package, etc.) you'll want to eventually set up a CI server as was mentioned earlier. You could also deliver using something like Salt or Chef, or simply have the test and production servers do a git update based on a branch or a tag if you want something easier. /* PLUG: http://plug.org, #utah on irc.freenode.net Unsubscribe: http://plug.org/mailman/options/plug Don't fear the penguin. */
