version control and development

[eluser]cahva[/eluser]
I've tested a couple of versioning tools. Started with Bazaar, then used GIT for a while and now settled using Mercurial. Mercurial has couple of benefits over GIT for our development. 1. IMO Its a little bit more windows friendly and 2. Netbeans supports it out of the box(and 3. CI switched to it also ).

Workflow is almost identical with CroNix. If there is only one dev doing changes to some project, he/she can do changes directly to the site on that server and after he/she is finished, does a commit at the end of the day. Then if the changes are ready for live, all we have to do is pull the changes and update on the live server. This is done by connecting server via SSH and do the pull+update from there.

When I work home, I use Wamp and do the changes locally and when I'm done, I commit+push the changes to project server. If the changes are ready for live, I SSH to the live server and pull+update the changes from project server.