Folder structure best practice

Richard_AU · Post by **Richard_AU** » Wed Jun 27, 2007 6:01 pm

Hello,

I need your recommendation on how should we structure our Vault folders
and how should we go with branching and merging.

We support two business units. Each of these business units has three
supported applications app1, app2, and app3.
App1 is shared between the two business units.

To make this clear we have business unit 1 app1, business unit 1 app2,
business unit 1 app3, business unit 2 app1, business unit 2 app2, business unit 2 app3.
App1 is the same for both business units and potentially we can share
many of the objects between the other two applications (that is, business unit 1 app2
can share many objects with business unit 2 app2, and business unit 1 app3 can share
many objects with business unit 2 app3).

We want to be able to system test our development changes before we put them into
our production code. If bugs are found we need to fix them till we are satisfied that
our code is stable and ready to go into production.
In the meanwhile we need to bug fix our current production code.

How should we then structure our folders and what process would you recommend
from your experience should we adopt.

Many Thanks,
Richard

lbauer · Post by **lbauer** » Thu Jun 28, 2007 2:06 pm

At SourceGear we do continuing work in the trunk, while branching each release. Maintenance releases are done in the branch and merged back into the trunk. An example here:

http://support.sourcegear.com/viewtopic.php?t=193

Also see Eric Sink's source control How To for information about branches and merging branches:

http://www.ericsink.com/scm/scm_branches.html

You say that App 1 is shared between two units. Each unit can simply edit App 1. Or, if App 1 is part of other projects, you can physically share the folder or files into the relevant Vault folder.

If you are using Visual Studio, you can add App 1 to each solution by using the Source Control-> Add from Source Control command.

Other users -- feel free to add your suggestions or comments.

Richard_AU · Post by **Richard_AU** » Fri Jun 29, 2007 12:15 am

Thank you for your response Linda.
What do you guys do with system test? That is, do you branch your development into system test and then branch your system test into production? If this is the case what do you do with production bug fixes? Do you merge them into two branches (development and system test)?

Thanks,
Richard

lbauer · Post by **lbauer** » Mon Jul 02, 2007 3:23 pm

We use only trunk and branch, and test as we go along. There isn't a specific system test line of development. We finalize a release and branch it after we've fixed all the bugs for that particular release.