_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.

      Your log-message must be in the following format (replace red text) and mention a specific revision number (or range of revisions) that is being merged into the trunk.

      Format Example 1: "merged branchname changes from r344 (spelling fixes) into the trunk."
      Format Example 2: "merged branchname changes from r344:405 (added chat feature) into the trunk."

  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

      • The weekly synchronization process uses the Merge a range of revisions feature of TortoiseSVN. See http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html#tsvn-dug-merge-range for details.
      • Your log-message must be in the following format (replace red text) and mention a specific revision number (or range of revisions) that is being merged into your branch.
      • Format Example: "merged trunk r505 into branch branchname."
      • Because merging only results in local modifications, it's not usually a high-risk operation. If you get the merge wrong the first time, simply svn revert the changes and try again.

      • After your special project is complete then merge it back to the trunk using either Reintegrate a branch, http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html#tsvn-dug-merge-reintegrate, or Merge two different trees, http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html#tsvn-dug-merge-tree
      • Your log-message must be in the following format (replace red text) and mention a specific revision number (or range of revisions) that is being merged into the trunk.
      • Format Example 1: "merged branchname changes from r344 (spelling fixes) into the trunk."
      • Format Example 2: "merged branchname changes from r344:405 (added chat feature) into the trunk."

      • Once the merge back into the trunk occurs, delete the branch in the repository using the TortoiseSVN web directory browser.