{subsection: Decide on a branch name}
-First, decide on a name for your branch, such that XXX describes the newness. If you want XXX to contain multiple words, separate them with underscores, not hyphens. Follow this structure:
-
-{code}
-[new-branch-name] == [old-branch-name without "-branch"]-XXX-branch
-{endcode}
-
-For example, a branch off of V6_5-branch for Paolo might be: "V6_5-paolo-branch". Something more complex would be: "V6_5-gridmanager_reorg-branch"
-
-Release branches are made for every release of Condor when we're almost ready to ship them. They should be named with the version of Condor they hold, for example: "V6_5_3-branch". We know that any branch name with a 3-number version like that is a release branch for that specific version.
+Our branch rationale and naming scheme is defined in GitNewBranchRules. Please
+follow it.
{code}
# Lets decide on the name "V7_1-GreatFeature-branch". This means we
@@ -283,19 +276,30 @@
{subsection: Document your branch}
-Second, you should document your tags in =src/CVS_Tags=. The manual is going to be branched along with the source so there should be no need to document anything in =doc/CVS_Tags= anymore. Follow the CVS HOWTO-branch instructions for documenting your new tag:
+Second, you should document your branch and or tags in GitBranchDescriptions.
+
+The description should include the date, where the new branch came from, what
+it is for, and any plans for when/where it's going to be merged back into (if
+we know them).
+
+An example for a tag is:
{verbatim}
- You *MUST* add a description of the new branch to the src/CVS_Tags
- file in the *parent* branch (where the new branch came from).
+3/2/2010 V7_5_1
+The offical tag for 7.5.1, from the V7_5_1-branch.
+Version string: $CondorVersion: 7.5.1 Mar 1 2010 BuildID: 220663 $
+Original build tag: BUILD-V7_5_1-branch-2010-2-28_2
+{endverbatim}
+
+An example for a branch is:
- The description should include the date, where the new branch came
- from, what it is for, and any plans for when/where it's going to be
- merged back into (if we know them). Once you make your changes,
- run "git commit src/CVS_Tags" and "git push" as usual to commit
- src/CVS_Tags.
+{verbatim}
+3/29/2010 V7_5_2-branch
+Branch for 7.5.2 release, created from BUILD-trunk-2010-3-27.
{endverbatim}
+Please follow the markup style of the nearby entries.
+
{subsection: Update the version string}
Third, and finally, you should fix the version string on your new branch. You do this by editing =src/condor_c++_util/condor_version.C= on your new branch. The exact version you decide on is up to you, but as always you should only change the "comment" portion of he version string, i.e. anything after =__DATE__= and before =$=. For example, if the old version string (on the V6_5-branch) looked something like =static char* {quote:CondorVersionString} = "$CondorVersion: 6.5.3 " __DATE__ " $";= you might choose =static char* {quote:CondorVersionString} = "$CondorVersion: 6.5.3 " __DATE__ " PRE-RELEASE-UWCS $";=.
