svn merge and how to best architect for a live site.
From: Daevid Vincent <daevid_at_daevid.com>
Date: Wed, 28 May 2008 15:54:09 -0700
This may be a little lengthy, but we need guidance on the best way to
. We are going to provide a LAMP / Symfony project web based service
. We have four developers
. All developers have a trunk checkout
. We're currently not using branches (we're not at that stage really
. We have a UAT box for testing which SVN UPDATEs from Subversion
. We have a Production box which also SVN UPDATEs from Subversion
Our problem is, what is the best way to set this up. The challenges are:
. Doing a complete checkout (like a branch) and setting up that
. How do we work on new (major) features/bugs (ie. normally this is
. We wish to release features/updates every two weeks to Production.
. We wish to release said critical bug fixes to Production as they
We were considering the idea of everyone working in the branch - which would
Keep in mind, the actual naming of 'branch' and 'trunk' is really arbitrary.
The question is how do we get all that magic in between. SVN MERGE seems
Is there a better solution? Obviously we're not the first to have a live web
This is an archived mail posted to the Subversion Users mailing list.