IBM SC34-4499-03 74

Alex can use either the GUI or the command line to reconcile the differences. Four

steps are required from the command line:

1. Check out the latest uncommitted version.

2. Extract the latest committed version.

3. Run the merge program against the two parts.

4. Check in the resultant part.

However,on the GUI the reconcile action automatically does the preceding steps for

you, which can save you a considerable amount of work if several parts require

reconciliation.

GUI

From the GUI, he:

1. Selects Parts →Collision Records from the Objects pull-down menu. The Collision

Record Filter window appears.

2. Types310 in the Work areas ﬁeld and selects OK. The Collision Records window

appears with optics.c listed as the part having the collision.

3. Highlights the optics.c entry and selects Reconcile from the pop-up menu. The

Reconcile Collision Record window appears with the required information pre-ﬁlled.

Alex does not have to reconcile every part for which a collision record is created.

He can choose either his copy or the copy at the release rather than combining the

two. For example, ifAlex wants to use his copy of optics.c without merging with the

copy at the release level, he selects the reject action (of course, he would not do

that without ﬁrst talking with Jenny). If he wants to use the copy of optics.c at the

release level without merging any of his changes into the copy at the release level,

he selects the accept action.

4. BecauseAlex wants to combine the two sets of changes, he selects Merge to start

the TeamConnectionmerge program, or any merge program of his choice. Alex

merges the changes and then saves and exits from the merge program.

TeamConnectionchecks the resultant part back in as part of this merge step.

The online help provides information on how to use the merge program.

5. Selects OK from the Reconcile Collision Record window.

74 User’s Guide

Contents

Main Page Page Page Contents Part 1. Introducing TeamConnection .................. 1 Part 2. Developing a product using TeamConnection ...........15 iv Part 3. Using TeamConnectionNotes Integrated Databases ........101 Part 4. Using TeamConnectionto build applications ............127 vi Part 5. Using TeamConnectionto package products ............199 Part 6. Appendixes ..........................225 viii Page Page Figures xii Notices Page Trademarks Page About this book Getting Started with the TeamConnectionClients How this book is organized Conventions Italics Tell us what you think xviii Part 1. Introducing TeamConnection Page Chapter 1. An introduction to TeamConnection Conguration management Packaging support Build support change control process TeamConnection denitions 4 TeamConnections client/server architecture Figure1 on page 5 is an example of a network of TeamConnection clients and servers. family servers TeamConnection database Interfaces Families Users and host lists 6 parts host list Components notication list Releases releases 8 Work areas work area Drivers Defects and features Processes 10 subprocesses processes Build Packaging Packaging 12 Roles people play pools Page Part 2. Developing a product using TeamConnection 16 Chapter 2. Getting familiar with the TeamConnection client interfaces Using the GUI Congure the environment variables in the .prole Ensure that the TeamConnectionclient command is accessible Starting the GUI 18 Stopping the GUI Performing tasks with the GUI Using the Settings notebook 20 Online help information Using the command line interface commandName Quick Commands Reference Using the TeamConnection web client 22 http://host name of the server:port number of your family testfam 7890 24 Chapter 3. The basics of using TeamConnection Laying the groundwork Authority to perform tasks Search 26 Finding objects within TeamConnection Finding parts Using work areas freezing 28 Naming your work areas Creating parts type path name Naming your parts Preparing to build your parts 30 connect Working with parts Working in serial or concurrent development mode Working with common parts common 32 disconnect Getting parts from TeamConnection PartExtract PartCheckOut current working directory Checking parts in to TeamConnection collision record 34 Finding different versions of TeamConnection objects myWorkArea, myPart, myWorkArea:1. :1 Versioning work areas 36 Versioning drivers Versioning parts Working with defects and features 38 Testing and verifying part changes Page Chapter 4. The states of TeamConnection objects Staying on Trackwith TeamConnection Processes. Defects and features sizing record 42 Page verication record 44 The states of work areas approver list 46 The states of drivers delta part tree 48 Verication and test records 50 Chapter 5. Working with no component or release processes serial development concurrent development Working in serial development Accepting a defect 52 Creating a work area Checking out a part 54 Searching for a part 56 Page Checking in a part 58 Page Verifying and testing part updates 60 Page Extracting a part 62 Checking out the part one more time Checking the part back in 64 Freezing the work area Refreshing the work area 66 Building the application Integrating the work area 68 Closing a defect Working in concurrent development 70 Refreshing the work area from the driver Integrating the work area 72 Reconciling differences 74 alternate version ID relative 76 Chapter 6. Working with component and release processes is driver members Moving through design, size, and review 78 Changing defect ownership Accepting a defect 80 Approving the x Checking out a part 82 Checking in the changes 84 Freezing the work area Building the application 86 Accepting x records Integrating changed parts into a release Adding a driver member 88 driver member Reconciling the differences Returning the work area to the x state Reactivating the x record Refreshing the work area 90 Refreshing the driver Building the driver 92 Restricting the driver Integrating the parts 94 Completing the driver Testing the built application 96 Using a congured process Retrieving a past version of a part 98 yes no yes 100 Part 3. Using TeamConnection Notes Integrated Databases Page Chapter 7. Introduction to TeamConnection Integrated Notes Databases Getting started advanced Prerequisites and dependencies Notes server 104 Using TeamConnection with Lotus Notes Sources of user information Database types Forms and subforms 106 Table1. Integrated database forms by database type (continued) Requirements User Dened Views 108 Reviews Document archiving Page Chapter 8. Creating and Maintaining Integrated Notes Databases administrator Lotus Notes Database Administrator Initializing the original template and creating a database template 112 x:\notes\data Page 114 and necessary Creating customized production databases 116 and Performing reconciliation 118 Database maintenance: refreshing design from a template x:\notes\data 120 Chapter 9. Database Design Strategies and Advanced Customization Rules of thumb and general advice as they are currently named Using the Customization setup facility 122 Notes Database Customization Modify TeamConnection Access Reconciliation of Notes and TeamConnection Data 124 Advanced customization subforms 126 Part 4. Using TeamConnection to build applications 128 Chapter 10. Basic build concepts The physical structure of the build function The build object model build tree 130 Parent-child relationships in a build tree 132 Page 134 Putting the pieces together 136 Chapter 11. Installing, starting, and stopping build servers Installing the build function Creating a build server on MVS hostname 138 3.a Creating a build server on MVS/OE Starting build servers using teamcbld buildDir 140 become userID Starting an MVS build server 142 unit_name Starting the MVS/OE build server /xxx/enu/teamcv3.cat Creating build startup les (for non-MVS environments) 144 Page Page Chapter 12. Working with build scripts and builders Creating a builder 148 Page return_value LE 4 Writing a build script 150 Passing parameters to a build script in place 152 any all Writing a simple build script Writing an executable le for a build script debug Testing a build script 154 Modifying the contents of a build script Putting a builder to work TeamConnectionCommands Reference Removing a builder from a part 156 Working with VisualAge C++ and Templates Page Chapter 13. Working with MVS build scripts and builders Creating a builder for MVS builds 160 Page return_value LE 4 162 Writing an MVS build script JCL Users Guide JCL Reference File name conversions for MVS Passing parameters to an MVS build script 164 TeamConnection syntax for MVS build scripts xxx Supported JCL syntax JCL Reference. 166 program_name EXEC statement DD STATEMENT Example of a build script for a C compile 168 Page Example of a build script for a COBOL compile 170 Example of a build script for a link 172 Page Page Chapter 14. Working with parsers Creating a parser 176 Writing a parser command le source le workarea release dependency list le Putting a parser to work input 178 Removing a parser from a part Page Chapter 15. Building an application: an example Page Starting the build servers pools Creating builders and parsers Creating the build tree for the application 184 Page 186 input 188 Page 190 Putting the build scripts to work Finishing the job and reporting the results to the user Monitoring the progress of a build 192 Running a build in spite of errors Building all parts, regardless of build times Finding out which parts will be built Canceling a build 194 More sample build trees Dening multiple outputs from a single build event output Synchronizing the build of unrelated parts 196 Page Page Part 5. Using TeamConnection to package products Page Chapter 16. Using TeamConnection to package a product Setting up your build tree for packaging Setting up a build tree for the gather tool 202 Page 204 Chapter 17. Using the Gather tool Using the teamcpak command for the Gather tool Input_le Command line ags 206 Page Examples of the teamcpak gather command Writing a package le for the Gather tool 208 Syntax rules for a Gather package le Keywords for a Gather package le 210 Page Using exit keywords in the DATAclause Using exit keywords in the RULE clause 212 Using exit keywords: an example Page Chapter 18. Using the Tivoli Software Distribution packaging tool Using the teamcpak command with Tivoli Software Distribution inputFile Command line ags 216 Example of the teamcpak softdist command Writing a package le for Tivoli Software Distribution italics Syntax rules for a Tivoli Software Distribution package le Keywords for a Tivoli Software Distribution package le 218 lename Problem determination for the Tivoli Software Distribution tool 220 Sample package le 222 Page 224 Page Page Appendix A. Environment Variables 228 Page family 230 Page 232 Table4. TeamConnection dynamically set build environment variables Setting environment variables 234 Appendix B. Importing makele information into TeamConnection makele rules le command le release 236 Creating a rules le empty 238 Appendix C. TeamConnection Merge The following lists the parameters which may be used with the tcmerge command. 240 Appendix D. Enabling an OS/2 Workframe project for TeamConnection Creating a TeamConnection-enabled Workframe project Setting up your project options Using your TeamConnection Workframe project Project actions 242 Part actions Using your project: a simple scenario 244 Appendix E. Enabling a Workframe/NT project for TeamConnection Setting up your project options: Using your TeamConnection WorkFrame project Project actions 246 Part actions Page Appendix F.Enabling and Using the ENVY/Manager- TeamConnection Bridge Overview of the ENVY/Manager-TeamConnection Bridge parts the bridge Scope of this documentation Release 250 TeamConnectionrelease Description of the ENVY/Manager-TeamConnection Bridge Basic functionality How the bridge communicates with TeamConnection Preparing to use the ENVY/Manager-TeamConnection Bridge Setting up the bridge environment Prerequisites 252 Environment variables Installing and activating the ENVY/Manager-TeamConnection Bridge bridge menu Loading the ENVY/Manager-TeamConnection Bridge must be loaded rst Testing the ENVY/Manager-TeamConnectionBridge 254 Using the ENVY/Manager-TeamConnection Bridge bridge conguration Show this dialog when exporting and importing Setting default properties Context page Operations page 256 force optimistic Import page Export page with 258 with without Exporting conguration maps and applications Exporting les Importing ENVY components from TeamConnection 260 Using the ENVY/Manager-TeamConnection Bridge: a simple scenario for VisualAge Generator developers Scenario assumptions Exporting ENVY components to TeamConnection 262 Object mapping in TeamConnection Build generation only if 264 Making a change to a member Page Appendix G. Source Code Control Users Guide Differences between other source code control providers and TeamConnection Projects vs Families Installing the TeamConnection source code control DLL 268 Connecting TeamConnection to an IDE Removing the TeamConnection Source Code Control DLL Using TeamConnection as your source code control provider Before you start Opening a project Integrated features 270 Page Migrating project data bases Migrating an existing project: 272 Starting a new project Starting Visual Basic: Starting Visual C++: Starting PowerBuilder: 274 Appendix H. Supported expandable keywords 276 Appendix I. Authority and notication for TeamConnectionactions 278 Page 280 Page 282 Page 284 Page 286 Page 288 Page 290 Page 292 Page 294 Page 296 Page 298 Page Page Appendix J. Sample REXX execs, build scripts, and parsers Sample REXX execs 302 Page 304 Sample build scripts Sample parsers Sample package les 306 Customer support 308 Bibliography IBM VisualAge TeamConnection Enterprise Server library TeamConnection technical reports DB2 310 Related publications Page Glossary A B dependencies build event server C parent 314 notication list serial development D build dependent base authority le allocation table implicit authority E user 316 F refresh G H I base authority explicit authority J L 318 M N P child component search state subprocess S T 320 common part type U V W Y Page Index Special Characters A B C 324 D E F G 326 H I K L M R 328 S T V W 330 Page Page Readers Comments Wed Like to Hear from You Readers Comments Wed Like to Hear from You IBMR _________________________________________________________________________________ SC34-4499-03 BUSINESS REPLY MAIL