Branching Strategy

Hi all,

I'm a svn newbie (i've worked with CVS but never with branches) and i've
been using svn for a while, but without branches. Now i want to start
using branches in my projects, but i don't know if my branching strategy
is good or not, and i have several questions to do.

Nowadays, I have three development stages in my projects: development
(several windows machines), testing (linux server) and production (linux
server?). Whenever i move a project to a testing or production stage, i
tag it so i can go back to a release if i need.

The problem i have is that in this projects, some configuration files
have absolute paths (hard disk paths, IPs) that are different in each
environment, so i have to change this files everytime i have a
testing/production relesase. This is what i want to avoid with branches.

My idea is to have three branches: trunk (development), testing and
production, where i can have the configuration files prepared for each
environment.

All the development should go to trunk brach, and testing and production
should be used (with tags) when we have a new release.

-> żIs there another (and better) way to do this?

Small fixes to a testing release would be done in the testing, and
merged with trunk later. The same could happend with production fixes.

-> żIs this safe, or is it going to be a merging-hell?

If i want to test something experimental that can stop the other
developers, i'd start a new branch, and delete it when finished, merging
if it's worth the change.

-> żIs this the correct usage of a branch?

Besides, i want to know if this strategy would need a lot of free disk
space or not, as i'm going to have my project files in, at least, three
branches.

If you see any problem or better solution please, let me now ...

Thanks in advance,

Keko

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Apr 24 12:38:10 2005