VCS用于开发，测试，生产环境[关闭]

I'm looking at several VC systems and wondering what suits my needs better.

Right now, I have the following:

  • My local machine (Win7) where I code with php with the PhpStorm.
  • A Debian Linux machine set up in my internal network.
  • A Debian Linux dedicated web server.

Ideally, I wan't to code in this machine, push any chances I make locally to my internal webserver (where I see the changes and test them out) and if all is good, push them to the web server.

Which VC system do you suggest: Git, SVN or CVS?

  • CVS is a little outdated and bears quite some problems compared to SVN
  • SVN is okay but you will need to setup your own server which means too much effort for a single developer environment
  • Git is maybe a little bit unusual when you are comming from a traditional VC as it's a distributed version control system. But once you get used to it you understand the strengths no matter if you are working alone or in a big, distributed team. You don't need to setup any server and it's even possible to share your repository with others via DropBox.

So I'd suggest Git. Find the documentation here.

I use Aptana to code webpages. It has an realy good build in ftp browser, so you can vieuw and edit the required file, and when you hit ctrl+s (save the file) the file on the ftp server will be updated.

So if you have an FTP server on that internal server, i recommend you to use aptana then. And use any ftp software for the final push...

I would recommend any of them that work on windows, which I'm assuming is where you are happiest to develop on.

I know GIT (GitBash) does because I use it myself, pretty sure SVN does, and theres a version of CVS that does (Tortoise CVS?)

I haven't used phpStorm yet (keep meaning to), but as the other answer mentioned Aptana I'll point out that Aptana has built in support for GIT

I don't see any problems =)

can recommend develop on native envirement make few virtual hosts on deban web server like dev.host_name test.host_name

make shared folder on debian server (using samba), make network disk on your win 7 and connect to share folder and work with folders dev and test like on own computer

Too late, but I'll suggest to use (or at least try) Mercurial.

  • It's supported by PHPStorm
  • It's more understandable as first SCM, than Git (and as not-first also)
  • It's not "poor cousin" in Windows world (TortoiseHG, if needed outside PHPStorm)
  • With MQ it provide more easier way for Configuration Management (because configurations of DEV and LIVE systems may differ)
  • Sharing (sporadical) repo in Mercurial (for pull-mode data-delivery) is a question of single internal Mercurial command hg serve, for Git situation is a lot worse