Re: [PHP] Re: How to use SVN + PHP

2009-01-22 Thread derby
Another tidbit... I am fairly new to SVN or any Version Control System. Whether its CVS, SVN, or GIT a VCS is essential even for solo projects. My setup is as follows, [and it seems to work pretty well]: 1. svn repo lives on dev server. 2. everything is in the trunk. I haven't touched

Re: [PHP] Re: How to use SVN + PHP

2009-01-22 Thread Nathan Rixham
derby wrote: Our dev team is using eclipse-pdt and subclipse plugin which integrates eclipse and subversion. Subversion or any VCS is essential. After 15 years of using FTP/SFTP/SCP, SVN has replaced it for all my web projects. you can get the RSE plugin for eclipse-pdt as well; I'd really

[PHP] Re: How to use SVN + PHP

2009-01-20 Thread Ross McKay
On Mon, 19 Jan 2009 22:32:49 +0100, Edmund Hertle wrote: I'm thinking about implementing Subversion to an existing php project for obvious reasons. Yay! What Nathan said, plus a couple of comments from me... [...] My ideas about using SVN are these: - Repository is managing trunk, branch and

[PHP] Re: How to use SVN + PHP

2009-01-19 Thread Nathan Rixham
Edmund Hertle wrote: Hey, I'm thinking about implementing Subversion to an existing php project for obvious reasons. But I have some trouble when thinking about the usage. there are lots of ways of using svn and I'm sure you'll get different opinions.. personally I always create a script to

[PHP] Re: How to use SVN + PHP

2009-01-19 Thread Edmund Hertle
2009/1/19 Nathan Rixham nrix...@gmail.com well the idea of svn is that should you find a problem you either rollback the file(s) to the good version (not rollback the whole site) or you commit updated files with the fix, then redeploy. No need to branch or such like. Well, yes, of course

[PHP] Re: How to use SVN + PHP

2009-01-19 Thread Nathan Rixham
Edmund Hertle wrote: 2009/1/19 Nathan Rixham nrix...@gmail.com well the idea of svn is that should you find a problem you either rollback the file(s) to the good version (not rollback the whole site) or you commit updated files with the fix, then redeploy. No need to branch or such like.

[PHP] Re: How to use SVN + PHP

2009-01-19 Thread Nathan Rixham
sorry i commented in all the wrong places :| Edmund Hertle wrote: By locally created and tested scripts you will of course not have those probs because you're not comitting everything. But locally developing brings some kind of care-taking like making sure you use everywhere the same version

[PHP] Re: How to use SVN + PHP

2009-01-19 Thread Edmund Hertle
2009/1/20 Nathan Rixham nrix...@gmail.com you don't have to locally develop, you can develop however you want :) svn is just version controlling all your files to make it easier to team work and to rollback code. you then tag good versions of the code in svn so you have a permanent easy to

[PHP] Re: How to use SVN + PHP

2009-01-19 Thread Nathan Rixham
Edmund Hertle wrote: 2009/1/20 Nathan Rixham nrix...@gmail.com you don't have to locally develop, you can develop however you want :) svn is just version controlling all your files to make it easier to team work and to rollback code. you then tag good versions of the code in svn so you have a

Re: [PHP] Re: How to use SVN + PHP

2009-01-19 Thread Chris
Edmund Hertle wrote: 2009/1/20 Nathan Rixham nrix...@gmail.com you don't have to locally develop, you can develop however you want :) svn is just version controlling all your files to make it easier to team work and to rollback code. you then tag good versions of the code in svn so you have a

[PHP] Re: How to use SVN + PHP

2009-01-19 Thread Edmund Hertle
2009/1/20 Nathan Rixham nrix...@gmail.com a merge is something you do manually, most of the time you just commit (overwrite) and svn will log the lines of code that changed - sometimes when multiple people work on the site you get a conflict, both changed the same lines - this is when you