Skip to main content

Using svn tags in java3d subprojects

This page describes the use and naming scheme for svn tags in the following java3d subprojects on java.net: j3d-core, j3d-core-utils, j3d-examples, and vecmath.

NOTE: the following has not been updated for svn, and still refers to the older CVS source code control system. While the naming convention for tags and branches remains the same, the commands used to effect tagging and branching are different.

Current Tags

The following tags are currently in use for Java 3D subprojects.

  • MAIN branch (trunk) — version 1.5.3
    Branch tag: N/A
    Revision tags (newest to oldest):
exp-1_5_3-build2  
Version 1.5.3-build2
exp-1_5_3-build1  
Version 1.5.3-build1
rel-1_5_2-fcs  
Version 1.5.2-fcs release build
root-1_6
 
Root (branch point) of dev-1_6 branch
exp-1_5_2-beta2  
Version 1.5.2-beta2
exp-1_5_2-beta1  
Version 1.5.2-beta1
chk-1_5_2-pre-gpl  
Checkpoint before GPL license changes (j3d-core and vecmath only)
rel-1_5_1-fcs  
Version 1.5.1-fcs release build
exp-1_5_1-beta2  
Version 1.5.1-beta2
exp-1_5_1-beta1  
Version 1.5.1-beta1
exp-1_5_1-build3  
Version 1.5.1-build3
exp-1_5_1-build2  
Version 1.5.1-build2
exp-1_5_1-build1  
Version 1.5.1-build1
rel-1_5_0-fcs  
Version 1.5.0-fcs release build
exp-1_5_0-beta2  
Version 1.5.0-beta2
chk-1_5_0-post-beta1  
Checkpoint after merging 1.5 into trunk
rel-1_4_0_01
 
Version 1.4.0_01 patch build
rel-1_4_0-fcs
 
Version 1.4.0-fcs release build
exp-1_4_0-beta4  
Version 1.4.0-beta4
exp-1_4_0-beta3  
Version 1.4.0-beta3
root-1_5
 
Root (branch point) of dev-1_5 branch
exp-1_4_0-beta2  
Version 1.4.0-beta2
chk-1_4_0-pre-beta2  
Checkpoint after merging 1.4 into trunk
chk-1_3_3-A
 
Checkpoint for merging into dev-1_4 branch
root-1_3_3-aces
 
Root (branch point) of dev-1_3_3-aces branch
rel-1_3_2-fcs
 
Version 1.3.2-fcs release build
exp-1_3_2-beta3
 
Version 1.3.2-beta3 build
exp-1_3_2-beta2
 
Version 1.3.2-beta2 build
root-1_4
 
Root (branch point) of dev-1_4 branch
exp-1_3_2-beta1
 
Version 1.3.2-beta1 build
exp-1_3_2-build8
 
Version 1.3.2-build8
exp-1_3_2-build7
 
Version 1.3.2-build7
exp-1_3_2-build5
 
Version 1.3.2-build5

  • Version 1.6 development branch
    • Branch tag:
    dev-1_6
      Revision tags (newest to oldest):
    postmerge-1_6-1_5_2-fcs  
    After merging 1.5.2-fcs changes
    root-1_6
     
    Root (branch point) of dev-1_6 branch
      Merge information:
      Following is a list of commands used to merge changes made on the MAIN branch (trunk) into the 1.6 branch. The commands listed below merge changes made between the release specified by the first "-j" tag and the release specified by the second "-j" tag into this (1.6) branch. The first merge command will use the branch point (root) of 1.6 as the first argument and 1.5.2-fcs as the second argument (i.e., it merges changes made on the trunk between the branch point and 1.5.2-fcs into the 1.6 branch). All subsequent merges will use the second argument of the previous merge command as the first argument of the next merge command.
    Merge Date

    Command used
    2008-06-30
     
    cvs update -j root-1_6 -j rel-1_5_2-fcs -kk -d -P .
    Note that the "-kk" option is sticky. This means that after doing a merge and a commit, you should throw away the cvs tree in which you did the merge. Otherwise, you will not get RCS keywords expanded in that workspace.

  • Version 1.5 development branch
    NOTE: This branch is closed—all changes have been merged back into the main trunk
    Branch tag: dev-1_5
      Revision tags (newest to oldest):
    exp-1_5_0-beta1  
    Version 1.5.0-beta1
    exp-1_5_0-build4  
    Version 1.5.0-build4
    exp-1_5_0-build3  
    Version 1.5.0-build3
    exp-1_5_0-build2  
    Version 1.5.0-build2
    exp-1_5_0-build1  
    Version 1.5.0-build1
    chk-1_5_0-pre-jogl
     
    Initial checkpoint before starting JOGL refactoring
    postmerge-1_5-1_4_0-fcs
     
    After merging 1.4.0-fcs changes
    postmerge-1_5-1_4_0-beta4
     
    After merging 1.4.0-beta4 changes
    postmerge-1_5-1_4_0-beta3
     
    After merging 1.4.0-beta3 changes
    root-1_5
     
    Root (branch point) of dev-1_5 branch
      Merge information:
      Following is a list of commands used to merge changes made on the MAIN branch (trunk) into the 1.5 branch. The commands listed below merge changes made between the release specified by the first "-j" tag and the release specified by the second "-j" tag into this (1.5) branch. The first merge command will use the branch point (root) of 1.5 as the first argument and 1.4.0-beta3 as the second argument (i.e., it merges changes made on the trunk between the branch point and beta3 into the 1.5 branch). All subsequent merges will use the second argument of the previous merge command as the first argument of the next merge command.
    Merge Date

    Command used
    2006-01-06
     
    cvs update -j root-1_5 -j exp-1_4_0-beta3 -kk -d -P .
    2006-02-08
     
    cvs update -j exp-1_4_0-beta3 -j exp-1_4_0-beta4 -kk -d -P .
    2006-02-24
     
    cvs update -j exp-1_4_0-beta4 -j rel-1_4_0-fcs -kk -d -P .
    YYYY-MM-DD
     
    cvs update -j rel-1_4_0-fcs -j xxxxx -kk -d -P .
    Note that the "-kk" option is sticky. This means that after doing a merge and a commit, you should throw away the cvs tree in which you did the merge. Otherwise, you will not get RCS keywords expanded in that workspace.

  • Version 1.4 development branch
    NOTE: This branch is closed—all changes have been merged back into the main trunk
    Branch tag: dev-1_4
      Revision tags (newest to oldest):
    postmerge-1_4-1_3_3-A  
    After merging changes from chk-1_3_3-A
    exp-1_4_0-beta1  
    Version 1.4.0-beta1
    exp-1_4_0-build6  
    Version 1.4.0-build6
    exp-1_4_0-build5  
    Version 1.4.0-build5
    exp-1_4_0-build4  
    Version 1.4.0-build4
    postmerge-1_4-shaderbin-final  
    After merging changes back in from dev-1_4-shaderbin
    exp-1_4_0-build3  
    Version 1.4.0-build3
    chk-1_4_0-pre3-A
     
    Checkpoint for merging into dev-1_4-shaderbin
    exp-1_4_0-build2  
    Version 1.4.0-build2
    exp-1_4_0-build1  
    Version 1.4.0-build1
    chk-1_4_0-pre1-A
     
    Checkpoint for merging into dev-1_4-shaderbin
    chk-1_4_0-shader-rev1
     
    Checkpoint of working shaders (revision 1)
    root-1_4-shaderbin
     
    Root (branch point) of dev-1_4-shaderbin branch
    postmerge-1_4-1_3_2-fcs
     
    After merging 1.3.2-fcs changes
    premerge-1_4-1_3_2-fcs
     
    Before merging 1.3.2-fcs changes
    postmerge-1_4-1_3_2-beta3
     
    After merging 1.3.2-beta3 changes
    premerge-1_4-1_3_2-beta3
     
    Before merging 1.3.2-beta3 changes
    postmerge-1_4-1_3_2-beta2
     
    After merging 1.3.2-beta2 changes
    root-1_4
     
    Root (branch point) of dev-1_4 branch
      Merge information:
      Following is a list of commands used to merge changes made on the MAIN branch (trunk) into the 1.4 branch. The commands listed below merge changes made between the release specified by the first "-j" tag and the release specified by the second "-j" tag into this (1.4) branch. The first merge command uses the branch point (root) of 1.4 as the first argument and 1.3.2-beta2 as the second argument (i.e., it merges changes made on the trunk between the branch point and beta2 into the 1.4 branch). All subsequent merges will use the second argument of the previous merge command as the first argument of the next merge command.
    Merge Date

    Command used
    2005-01-08
     
    cvs update -j root-1_4 -j exp-1_3_2-beta2 -kk -d -P .
    2005-02-18
     
    cvs update -j exp-1_3_2-beta2 -j exp-1_3_2-beta3 -kk -d -P .
    2005-03-22
     
    cvs update -j exp-1_3_2-beta3 -j rel-1_3_2-fcs -kk -d -P .
    2005-10-17
     
    cvs update -j rel-1_3_2-fcs -j chk-1_3_3-A -kk -d -P .
    YYYY-MM-DD
     
    cvs update -j chk-1_3_3-A -j xxxxx -kk -d -P .
    Note that the "-kk" option is sticky. This means that after doing a merge and a commit, you should throw away the cvs tree in which you did the merge. Otherwise, you will not get RCS keywords expanded in that workspace.

  • Version 1.4 ShaderBin development branch
    NOTE: This branch is closed—all changes have been merged back into the dev-1_4 branch
    Branch tag: dev-1_4-shaderbin
      Revision tags (newest to oldest):
    chk-1_4-shaderbin-final
     
    Checkpoint for merging back into dev-1_4 branch
    root-1_4-shaderbin
     
    Root (branch point) of dev-1_4-shaderbin branch
      Merge information:
      Following is a list of commands used to merge changes made on the dev-1_4 branch into the dev-1_4-shaderbin branch. The commands listed below merge changes made between the release specified by the first "-j" tag and the release specified by the second "-j" tag into this (1.4-shaderbin) branch. The first merge command uses the branch point (root) of 1.4-shaderbin as the first argument and 1.4.0-pre1-A as the second argument (i.e., it merges changes made on the trunk between the branch point and pre1-A into the 1.4-shaderbin branch). All subsequent merges will use the second argument of the previous merge command as the first argument of the next merge command.
    Merge Date

    Command used
    2005-04-08
     
    cvs update -j root-1_4-shaderbin -j chk-1_4_0-pre1-A -kk -d -P .
    2005-04-15
     
    cvs update -j chk-1_4_0-pre1-A -j exp-1_4_0-build1 -kk -d -P .
    2005-05-11
     
    cvs update -j exp-1_4_0-build1 -j chk-1_4_0-pre3-A -kk -d -P .
    YYYY-MM-DD
     
    cvs update -j chk-1_4_0-pre3-A -j xxxxx -kk -d -P .
    Note that the "-kk" option is sticky. This means that after doing a merge and a commit, you should throw away the cvs tree in which you did the merge. Otherwise, you will not get RCS keywords expanded in that workspace.

  • Version 1.3.3-aces development branch (for DX9 work by user "aces")
    • Branch tag:
    dev-1_3_3-aces
      Revision tags (newest to oldest):
    root-1_3_3-aces
     
    Root (branch point) of dev-1_3_3-aces branch

    Description of Naming Scheme

    I. Revision (non-branch) tags

    We use non-branch "revision" tags in CVS so we can later refer to a release by name without having to know the individual RCS revision numbers of each file or the exact date and time we made a release. This is done for one (or both) of two main reasons: first, to mark a release or otherwise checkpoint the state of the repository; second, to mark the point at which you will then branch. We use the following naming scheme to identify a revision tag.

    A. Revision tags used to mark releases or checkpoint the state:

    {exp|rel}-<MAJOR>_<MINOR>_<SUBMINOR>{_<PATCH>|-{build<N>|alpha<N>|beta<N>|rc<N>|fcs}}
    chk-<MAJOR>_<MINOR>_<SUBMINOR>-<NAME_OF_CHECKPOINT> // Use sparingly
    {pre|post}merge-<DST_BRANCHID>-<SRC_MERGE_POINT>

    for example:

    exp-1_3_2-build5
    exp-1_3_2-beta1
    rel-1_3_2-rc2
    rel-1_4_0-fcs
    rel-1_3_2_01
    postmerge-1_4-1_3_2-beta2
    chk_1_4_0-working-shaders

    Use the following command to create a revision tag. Be sure your sources are up to date for the revision that you wish to tag and that you have committed any changes before running the "tag" command:

    cd <PROJECT-ROOT-DIR>
    cvs tag -c <tagname>

    For example:

    cd cvs-dirs/j3d-core
    cvs tag -c exp-1_3_2-build5

    B. Revision (non-branch) tags used to mark the root of a development branch:

    root-<branchid> // "branchid" is defined below

    for example:

    root-1_4

    II. Branch tags

    We use branch tags in CVS so we can refer to it later by name:

    dev-<branchid>
    patch-<branchid>

    where "branchid" is <MAJOR>_<MINOR>[_<SUBMINOR>][-<QUALIFIER>], for example:

    dev-1_4
    patch-1_3_2

    Use the following command to create a branch tag.

    cd <PROJECT-ROOT-DIR>
    cvs tag -b -r <root_tagname> <branch_tagname>

    For example:

    cd cvs-dirs/j3d-core
    cvs tag -b -r root-1_4 dev-1_4


     
     
    Close
    loading
    Please Confirm
    Close