I think it is a bit sad that almost all discussion in this thread is
focused on the VCS to use and not about the guidelines. Apparently
emotions regarding the tools are much more intense than about the
created work.
Maybe it's a sign?
(Hint: re-read all the stuff you wrote, and then reconsider what Marc said about automation)
-- David Hendricks (dhendrix) Systems Software Engineer, Google Inc.