We have our source code in Subversion. We primarily build and deploy from the trunk, but there are times when we want to build/deploy from a feature branch. For example, there may be code that we want to deploy into the QA environment and test before merging into the trunk and deploying into production.
Our repository looks someting like this:
Where NewFeature1 is a branch from trunk to implement a new feature that will be merged back into trunk when it is finished and ready to deploy.
We have a build configuration in TeamCity for each project that compiles the project and produces an installer (MSI). We then have another build configuration, that depends on the compile, that deploys the MSI to the servers it needs to deploy to. The compile and deploy currently work off of the trunk, but we would like to run the build off of a branch to deploy incomplete features into the test environment.
What is the best way to accomplish this? We are a fairly small group, so I am open to changing how we setup our builds or version control.