Moving a Branch Tag

Obsolete CVS page

refer to Patching_a_Branch

How? ("Who" in parenthesis)

• (Build-Meister): Check the CVS log to make sure that you are only picking up only one change (between the last branch and the developer's change).

hgwbeta> cd $BUILDDIR/v${BRANCHNN}_branch/kent/src
hgwbeta:/data/tmp/releaseBuild/v190_branch/kent/src> cvs log hg/someCgi/someFile.c

• (Build-Meister): Tell the program which file and version you want to change to.

hgwbeta> cd $WEEKLYBLD
hgwbeta:/cluster/bin/build/scripts> vi MoveBranchTagFiles.conf

• • This is a list and you can have more than one line if you need.
  • Edit this file to include the file name and new version number like so:

hg/someCgi/someFile.c 1.234

• (Build-Meister): Do a test run and verify that everything is set up correctly:

hgwbeta:/cluster/bin/build/scripts/moveBranchTag.csh

• (Build-Meister): If it is correct, run it for real:

hgwbeta:/cluster/bin/build/scripts/moveBranchTag.csh real

• (Build-Meister): Determine which CGIs are affected by this file change:

hgwbeta> cd /usr/local/apache/cgi-bin
hgwbeta:/usr/local/apache/cgi-bin> ./dependencies fileName.c

• (Build-Meister): Go to the current build:

hgwbeta> cd $BUILDDIR

• (Build-Meister): Determine the current branch number. It will be the most recent directory that looks like "v---_branch".

hgwbeta:/data/tmp/releaseBuild> ls -ltr

• (Build-Meister): Do a 'make' in the library directory, if necessary. If the file change was a lib file, then do a make in the corresponding lib directory:

hgwbeta:/data/tmp/releaseBuild/vXYZ_branch/kent/src/hg/lib> make

• • -or-

hgwbeta:/data/tmp/releaseBuild/vXYZ_branch/kent/src/lib> make

• (Build-Meister): Do a 'make alpha' in the CGI directories that are impacted by the change:

hgwbeta:/data/tmp/releaseBuild/vXYZ_branch/kent/src/hg/hgTracks> make alpha

• • -or- if it was a library function change and you need to make all cgis, do make alpha in kent/src/hg/

hgwbeta:/data/tmp/releaseBuild/vXYZ_branch/kent/src/hg> make alpha

• (Build-Meister): Reply to the email to the Developer and browser-qa that the tag has been moved and binaries made on hgwbeta.
• (QA): Test the change on hgwbeta.
• (QA): Reply to the email about the efficacy of the change.

• Additional notes:
  • Adding brand new files requires using the command-line option "override" following "real" since there is no previous revision.
  • HEAD can be used to specify the latest version, but using a proper revision number is best.