git commit -a -m "documented V7_0_3-branch tag for 7.0.3 release" git push origin V7_0-branch {endcode} + 1: Fix the version string in the release branch. However, in this case, the goal is to remove the "=PRE-RELEASE=" and other junk from the version string so you're left with an official version string for the final release. *:: =git checkout V7_0_3-branch= *:: Edit =src/condor_c++_util/condor_version.cpp= @@ -83,11 +84,10 @@ *:: =git commit -a -m "updated version string for 7.0.4"= *:: =git push origin V7_0-branch= -1: Get ready to make a release branch for the manual. You should ensure that ALL of the required doc merges are done. Usually Karen (smoler@cs) takes care of this, but you should check with her to coordinate. If she's not around, there are usually 3 merges that need to happen for any development series release. For example, to release 7.1.1, assuming we've been updating the V7_0_3-branch of doc for stable series changes, you'd need to do the following before you could make a V7_1_1-branch of doc: +1: Get ready to make a release branch for the manual. You should ensure that ALL of the required doc merges are done. Usually Karen (smoler@cs) takes care of this, but you should check with her to coordinate. If she's not around, there are usually 3 merges that need to happen for any development series release. For example, to release 7.1.1, assuming we've been updating the V7_0_3-branch of doc for stable series changes, you'd need to do the following before you could make a V7_1_1-branch of doc. If you're doing a stable series release, you'd only need to do the first of those merges (=V7_0_3-branch= into =V7_0-branch=) and you'd be ready to create a =V7_0_4-branch= of the manual. *:: =V7_0_3-branch= into =V7_0-branch= (the current 7.0 manual) *:: =V7_1_0-branch= into =V7_1-branch= (the current 7.1 manual) *:: =V7_0-branch= into =V7_1-branch= (to get all the recent 7.0 changes into 7.1 as well) -If you're doing a stable series release, you'd only need to do the first of those merges (=V7_0_3-branch= into =V7_0-branch=) and you'd be ready to create a =V7_0_4-branch= of the manual. 1: Make a release branch for the manual. ASK KAREN FIRST! For example, if you're releasing 7.0.3: *:: =git clone /p/condor/repository/CONDOR_DOC.git=