_Repository Policies

Repository Policies

Below are the repository policies for projects of various durations:

1. Projects < = 3 days: Work straight from the trunk and update/commit daily.

   1. The Developer may use the trunk as their working directory and update and commit changes directly to the trunk daily.

2. Projects > 3 days: Work off of a branch and merge branch changes back into the trunk.

   1. The Developer must work from a branch off of the trunk. This keeps the branch entirely separate, then merge the branch changes back into trunk.

   2. Your working directory will be your branch.

   3. See Lead Liaison for directions on what branch you should be working from.

   4. Merge branch changes back into the trunk using TortoiseSVN merge wizard and do a Merge a range of revisions, with the revision range being the revision span of your branch. See http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html#tsvn-dug-merge-range for details.

3. Special Projects: Work off of a branch and merge branch changes back into the trunk weekly.

   1. The Developer must work from a branch off of the trunk.

   2. Your working directory will be your branch.

   3. See Lead Liaison for directions on what branch you should be working from.

   4. Since this is a special project that will take longer you need to account for changes in the trunk and need to keep the branch synchronized with the trunk weekly. This simply means that every week you merge trunk changes into your branch (weekly synchronization), so that the branch contains all the trunk changes plus the new feature.

   5. Follow the three steps outlined below through the course of the project