Reconciling differences | IBM SC34-4499-03 specs

Figure 22. Integrate Work Areas window

Command

From a command line, she issues the following command:

teamc workarea -integrate 415 -release robot_control

Result

Because Jenny is up-to-date with the latest view of the driver, her changes are integrated after TeamConnection preserves a copy of the previous version of the release.

Reconciling differences

Later, Alex is ready to integrate his modi®cations. Alex issues a refresh command from the driver, as Jenny did (see page 71 for instructions).

This time, Alex receives a message that collision records were generated, because both he and Jenny have updated the same parts. At this time he does not know which parts collided. TeamConnection refreshes work area 310 with the exception of the part optics.c, which had the collision. Alex's work area shows the following parts:

brain.c (Jenny©s modification 3) brain.obj (Jenny©s modification 3) brain.exe (Contains Alex©s modification 5) arm.c

arm.obj

hand.c (Joy©s modification, Ken©s modification) hand.obj (Joy©s modification, Ken©s modification) leg.c

leg.obj

foot.c

foot.obj

optics.c (Alex©s modification 5) optics.obj (Alex©s modification 5)

Chapter 5. Working with no component or release processes 73

Image 93

IBM SC34-4499-03 manual Reconciling differences, Integrate Work Areas window

Contents

IBM Page IBM Fourth Edition March Contents States of TeamConnection objects Working with no component or release processesWorking with component and release processes Part 4. Using TeamConnection to build applications Part 3. Using TeamConnection Notes Integrated DatabasesIntroduction to TeamConnection Integrated Notes Databases Creating and Maintaining Integrated Notes Databases Working with build scripts and builders Installing, starting, and stopping build serversWorking with MVS build scripts and builders Working with parsers Creating a parser Part 5. Using TeamConnection to package products Appendix G. Source Code Control Users Guide Appendix H. Supported expandable keywordsAppendix J. Sample Rexx execs, build scripts, and parsers Readers Comments Ð Wed Like to Hear from You Users Guide Figures Xii Users Guide Xiii Xiv Users Guide Trademarks Xvi Users Guide How this book is organized About this bookConventions Xvii Tell us what you think Part 1. Introducing TeamConnection Users Guide An introduction to TeamConnection TeamConnections client/server architecture TeamConnection denitions Interfaces TeamConnection database Families Users and host listsParts Components Check outCheck Work areas Releases Drivers Processes Defects and features Approval Build Family administrator System administratorPackaging Roles people play End user Build administrator Users Guide Part 2. Developing a product using TeamConnection Working with component and release processes Getting familiar with the TeamConnection client interfaces Using the GUI Tasks window Starting the GUI Performing tasks with the GUI Stopping the GUI On the GUI Using the Settings notebook Online help information Using the command line interface Using the TeamConnection web client Getting familiar with the TeamConnection client interfaces Users Guide Laying the groundwork Basics of using TeamConnection Components window Authority to perform tasks Finding parts Finding objects within TeamConnection Using work areas BuildViewPartFull Creating parts Naming your work areas Preparing to build your parts Naming your parts Working in serial or concurrent development mode Working with partsDependent Working with common parts Your workstations current working directory Getting parts from TeamConnection Checking parts in to TeamConnection Versioning releases Finding different versions of TeamConnection objects Versioning work areas Versioning drivers Analyzing defects and features Working with defects and featuresDesigning the resolution Versioning parts Resolving defects and implementing features Testing and verifying part changesVerifying the resolution of the defect or feature Reviewing the design and resource estimates Users Guide Component subprocesses States of TeamConnection objectsRelease subprocesses Open state Returned state Canceled stateDesign state Size state Review state Working stateVerify state Closed state States of work areas Approve stateFix state Integrate state Restrict state States of driversCommit state Test state Restrict state Verication and test records Users Guide Working in serial development Working with no component or release processes For information about this task Go to this Accepting a defect Command Creating a work areaResult Create Work Areas window Checking out a part Check Out Parts window Searching for a part Part Filter window Selects Save to Task List Edit Task List window Checking in a part Teamc part -checkin optics.c -release robotcontrol -workarea Thus, work area 310 contains the following parts Verifying and testing part updates Build Parts window Extract Parts window Extracting a part Check Out Parts Checking out the part one more time Checking the part back Now the work area contains the following parts Freezing the work area Refreshing the work area Refresh Work Areas window Building the application Integrating the work area Integrate Work Areas window Closing a defect Verify Defects window Working in concurrent development Following tasks are required Refreshing the work area from the driver From a command line, she issues the following command Reconciling differences GUI Reconcile Collision Record window Result Working with component and release processes Moving through design, size, and review Results Changing defect ownership Accepting a defect Approving Accept Approval Records window \robot\src in the Destination directory eld \robot\src in the Source directory eld Checking in the changes Now the work area contains the following part versions Teamc workarea -freeze 456 -release robotcontrol Building the application Complete Fix Records window Accepting x records Adding a driver member Integrating changed parts into a release Returning the work area to the x state Reconciling the differences Activate Fix Records window Reactivating the x record Refreshing the driver Refresh Drivers window Building the driver Restricting the driver Restrict Drivers window Integrating the parts Complete Drivers window Completing the driver Accept Test Records window Testing the built application Retrieving a past version of a part Using a congured process Teamc workarea -freeze 1208 -release robotcontrol Working with component and release processes TeamConnection system returns the following report 101 Part 3. Using TeamConnection Notes Integrated Databases Users Guide Introduction to TeamConnection Integrated Notes Databases Getting started103 Using TeamConnection with Lotus Notes Prerequisites and dependenciesSources of user information Database types Test Case Management and Tracking Forms and subformsGeneric User Dened Requirements Views All documents Document archiving Reviews Users Guide Important notice to administrators Creating and Maintaining Integrated Notes Databases111 Initializing the original template and creating a database Select Access Control Users Guide Select File-Save Select Administration-Document Control Creating customized production databases Select Administration-Document Control Performing reconciliation From the File menu, select Database-Replace Design Database maintenance refreshing design from a template Important notice to administrators Rules of thumb and general advice Database Design Strategies and Advanced Customization121 Using the Customization setup facility Common Database Options Modify Database Optional InformationDatabase-specic Options Modify the document hierarchy Reconciliation of Notes and TeamConnection Data Modify TeamConnection Access Activate Reconcile Defects and Features Advanced customizationLog Document Options Users Guide 127 Part 4. Using TeamConnection to build applicationsBasic build concepts Working with parsers Building an application an example Basic build concepts Physical structure of the build function129 TeamConnection part Build object modelBuild event Builder Build script Parent-child relationships in a build treeInput parts Output parts Users Guide Sample build object model for msgcat.exe Working with a build tree Build tree for the hello application For more information about this task Go to this Putting the pieces together For more information about this task Go to this Installing the build function Installing, starting, and stopping build serversCreating a build server on MVS 137 Cd JCL data set for load module Cd data set for teamproc jcl Creating a build server on MVS/OE Starting build servers using teamcbld Starting an MVS build server Runpgm Exec PGM=TEAMCBLD Starting the MVS/OE build server Creating build startup les for non-MVS environments Stopping an MVS build server Stopping the build servers Users Guide Working with build scripts and builders Creating a builder147 Release Fromscriptfilespec -scriptname Environment Writing a build script TimeoutComparison operator and RC value Parameters As attributes of a builder Passing parameters to a build script As attributes of a part in the build tree As parameters of the part -build command Writing an executable le for a build script Writing a simple build script Testing a build script Putting a builder to work Modifying the contents of a build script Modify Part Properties window Removing a builder from a part Working with VisualAge C++ and Templates Users Guide Working with MVS build scripts and builders Creating a builder for MVS builds159 Builder Script, File type, and Source le File type none Script fhbcFile type none Script null Comparison operator are as follows ± EQ or == Equals Fhbmasm.jcl Writing an MVS build scriptFhbcobm.jcl Fhbmpli.jcl Passing parameters to an MVS build script File name conversions for MVS Tcbldusr TeamConnection syntax for MVS build scripts Exec statement Supported JCL syntaxPositional parameters Keyword parameters DD Statement Example of a build script for a C compile WELLSK.TEAMC.ERROR Working with MVS build scripts and builders UNIT=SYSDA,SPACE=TRK,10,5 Example of a build script for a Cobol compile DCB=RECFM=FB,LRECL=80,BLKSIZE=3200 Example of a build script for a link Sysmod DD TCEXT=LOAD,DISP=NEW,DELETE Working with MVS build scripts and builders Users Guide Working with parsers Creating a parser175 Create Parser window Include Writing a parser command le Putting a parser to work Removing a parser from a part From a command line, type the following 181 Building an application an example Sample build tree Starting the build servers Creating builders and parsers Creating the build tree for the applicationMvspool Create Parts window Create Parts window Modify Part Properties window Connect Parts window Build tree display Starting the build on the client Build target Build modeWork area Build pool Putting the build scripts to work UnconditionalDetail le name Monitoring the progress of a build Finishing the job and reporting the results to the user Building all parts, regardless of build times Running a build in spite of errors Finding out which parts will be built Canceling a build Dening multiple outputs from a single build event More sample build trees He creates the collector part Synchronizing the build of unrelated parts Building an application an example Users Guide Chapter Using TeamConnection to package a product Part 5. Using TeamConnection to package products199 Chapter Users Guide 201 Using TeamConnection to package a product Setting up a build tree for the gather tool Setting up your build tree for packaging She also connects a readme le for the application Adding the gather step to the build tree Using the Gather tool Using the teamcpak command for the Gather tool205 Command line ¯ags StringInputles Using the Gather tool Examples of the teamcpak gather command Writing a package le for the Gather toolSyntax rules for a Gather package le Keywords for a Gather package le Packageformat gatherTargetroot targetrootpath Source list of le specications Target Targetpath Using exit keywords in the Data clause Using exit keywords in the Rule clauseEXITPRIOR, EXITPOST, and Exitreplace String Package le looks like this Using exit keywords an example Users Guide 215 Using the Tivoli Software Distribution packaging tool InputFile Example of the teamcpak softdist command Writing a package le for Tivoli Software DistributionSyntax rules for a Tivoli Software Distribution package le Keywords for a Tivoli Software Distribution package le ExamplePackageformat softdist Nodes Installpgm Log le Sample package leOption Trace facility Profile Using the Tivoli Software Distribution packaging tool Exit # end of file 225 Part 6. Appendixes Users Guide 227 Appendix A. Environment Variables Nlspath Tcbuildpool Tccasesense Tcmakeimportverbose Tcrelease TeamConnection dynamically set build environment variables Setting environment variables 235 Appendix B. Importing makele information into TeamConnection Modied makele Create leConnect le Creating a rules le ContentLe mask Connect Component 239 Appendix C. TeamConnection Merge Parameter Description Creating a TeamConnection-enabled Workframe project Setting up your project options241 Project actions Using your TeamConnection Workframe project View part information Part actionsEdit part Show parts Using your project a simple scenario Tcuser 245 Tcbecome TC Extract Part TC View Part ContentsTC View Part Information TC Build Part Users Guide 249 Overview of the ENVY/Manager-TeamConnection Bridge Scope of this documentation Preparing to use the ENVY/Manager-TeamConnection Bridge How the bridge communicates with TeamConnection Setting up the bridge environment PrerequisitesEnvironment variables Loading the ENVY/Manager-TeamConnection Bridge Testing the ENVY/Manager-TeamConnection Bridge Using the ENVY/Manager-TeamConnection Bridge Setting default propertiesDefaults Context OperationsLocking Import Exporting Envy components to TeamConnection ExportReplace existing les Storage in TeamConnection Exporting conguration maps and applications Importing Envy components from TeamConnection Exporting les Scenario assumptions TeamConnection EnvyVisualAge Generator Developer Build generation Object mapping in TeamConnection TeamConnection build function TeamConnection change control Making a change to a member TeamConnection change control Appendix G. Source Code Control Users Guide Projects vs Families267 Installing the TeamConnection source code control DLL Using TeamConnection as your source code control provider Connecting TeamConnection to an IDERemoving the TeamConnection Source Code Control DLL Before you start Opening a project Integrated features Check-in Full features of TeamConnectionCheck-out Uncheck-out Migrating project data bases Starting a new project Users Guide 275 Appendix H. Supported expandable keywords Then the expanded keywords will look like 277 Associated release ApprovalReject Approval record owner Page Page Page Page Page Page Page Page Page Page Page Page Page Page Page Page Page New test record owner, subscribers Page Page Page Users Guide Appendix J. Sample Rexx execs, build scripts, and parsers Sample Rexx execs301 Script name Function Inputs DrvrMem Lists the defect and feature members of a DriverName Script name Function Inputs Sample build scripts Sample package les Sample parsers 307 Customer supportIBM Talklink Internet DB2 service maintenance and technical library Bibliography IBM VisualAge TeamConnection Enterprise Server library309 TeamConnection technical reports Glossary Related publications Users Guide 313 GlossaryCompare to Contrast with Users Guide Glossary End user. See user See also build dependent HPFS. See high-performance le system Users Guide Pool. See build pool Users Guide TeamConnection superuser. See superuser Users Guide 323 Index Builder Debug GUI Exitpost Parts nding Releases Tcmakeimportrules 227, 235 Work area Automatic creation Users Guide How satised are you that the information in this book is Readers Comments Ð Wed Like to Hear from You Readers Comments Ð Wed Like to Hear from You IbmrPage Ibmr