[lpr22]

Specifically for the requirement "Is there another open source vcs that would be a more natural upgrade to CVS": the answer is hands down Subversion for that requirement. If you want distributed or "more modern" but not git, perhaps Mercurial or Bazaar, but they're less prevalent choices.

[labrador]

Thank you! Subversion does seem like a great fit. Mercurial seems like it might be easier to use (Facebook uses their own customized version [1]), but we don't need distributed at this time.

[1] https://changelog.com/posts/facebook-mercurial-git