# This is a test P4Baseline & Branch Import config file. #----------------------------------------------------------------------------- # Baseline Definition #----------------------------------------------------------------------------- # This defines baselines to be imported, and indicates their current location # on the filesystem. These baselines must be extracted from the old version # control system, grabbing the appropriate versions of files to match the # baseline name. Note that each directory is expected to contain essentially # similar structures, as the represent different versions of the same # software product or system. BASELINE|FGS-1.0|/p4import/baselines/FGS-1.0.tar.gz BASELINE|FGS-1.1|/p4import/baselines/FGS-1.1 BASELINE|FGS-1.1.p1|/p4import/baselines/FGS-1.1.p1 BASELINE|FGS-1.1.p2|/p4import/baselines/FGS-1.1.p2 BASELINE|FGS-1.1.p2-to-MAIN-MergeResult|/p4import/baselines/FGS-1.1.p2-to-MAIN-MergeResult BASELINE|FGS-1.1.p3|/p4import/baselines/FGS-1.1.p3 BASELINE|FGS-2.0-Dev|/p4import/baselines/FGS-2.0-Dev #----------------------------------------------------------------------------- # Sample Histogram (this looks better in PowerPoint). #----------------------------------------------------------------------------- # # FGS-1.0 # o--------------->o # | |FGS1.0.x-R # | # | # | FGS-1.1 # o--------------->o # | |FGS-1.1.x-R # | | # | | FGS-1.1.p1 # | o # FGS-2.0 | | FGS-1.1.p2 # o<------o<---------------o # | | # | | FGS-1-1.p3 # | o # | FGS-2.0-Dev (WIP) # o # #----------------------------------------------------------------------------- # Branching Information. # This details the branching operations, capturing the "arrows" from the # PowerPoint diagram. #----------------------------------------------------------------------------- UPDATE|FGS-1.0|//ImportTest/MAIN/...|Import Baseline FGS-1.0. BRANCH|//ImportTest/MAIN/fgs/...|//ImportTest/Rel/FGS-1.0.x-R/fgs/...|Created branch FGS-1.0.x-R. UPDATE|FGS-1.1|//ImportTest/MAIN/fgs/...|Import Baseline FGS-1.1. BRANCH|//ImportTest/MAIN/fgs/...|//ImportTest/Rel/FGS-1.1.x-R/fgs/...|Created branch FGS-1.1.x-R. UPDATE|FGS-1.1.p1|//ImportTest/Rel/FGS-1.1.x-R/fgs/...|Imported baseline FGS-1.1.p1. UPDATE|FGS-1.1.p2|//ImportTest/Rel/FGS-1.1.x-R/fgs/...|Imported baseline FGS-1.1.p2. UPDATE|FGS-1.1.p2-to-MAIN-MergeResult|//ImportTest/MAIN/fgs/...|Result of merging FGS-1.1.p2 back to MAIN $Ndone in original SCM system. RECORD_AS_MERGED|//ImportTest/Rel/FGS-1.1.x-R/fgs/...|//ImportTest/MAIN/fgs/...|Merged FGS-1.1.p2 back to MAIN. UPDATE|FGS-1.1.p3|//ImportTest/Rel/FGS-1.1.x-R/fgs/...|Imported baseline FGS-1.1.p3. RENAME|//ImportTest/MAIN/fgs/src/makefile|//ImportTest/MAIN/fgs/src/makefile_renamed|Rename makefile BRANCH|//ImportTest/MAIN/fgs/...|//ImportTest/Dev/FGS-2.0/fgs/...|Created FGS-2.0 development branch from MAIN. UPDATE|FGS-2.0-Dev|//ImportTest/Dev/FGS-2.0/fgs/...|Captured current state of development files on FGS-2.0 branch.