Manuals / IBM / Computer Equipment / Personal Computer

IBM SC34-4499-03 manual Appendix C. TeamConnection Merge, 239

Models: SC34-4499-03

1 356

Download 356 pages 55.74 Kb

Page 259

Appendix C. TeamConnection Merge

The TeamConnection VisualMerge provides a way for you to merge two or three selected ®les together to make one single ®le. You can select options for viewing

differences and collisions, as well as view the composite output of the merged ®les. Both a command line (tcmerge) and a graphical user interface are provided. The ®gure

below describes the merge of three ®les into a single ®le. Items one through six represent the main stream of development for a particular part or ®le. Item 2 represents the base or common ®le from which two streams proceed. At the time of the merge, the most recent version in the two streams are items 4 and 2.3. In this scenario, the user selects the base or common ®le, item 2, as input 1. The user also uses item 4, the latest version in development, as input 2. The latest version in the branch is represented as item 2.3, or input 3. Item 5 represents the outcome of the merge. Once the merge is complete a window appears with the three original ®les and the ®nal merged ®le.

The following is the command line syntax for TeamConnection VisualMerge with the parameter abbreviations shown. The ®rst set of brackets encloses the abbreviation that

may be used; the remainder shows the full parameter name. For example, [-re[place]]indicates that -reis the abbreviation for the replace parameter.

tcmerge <file1directory1> <file2directory2> [<file3directory3>] [-ti[tles] <titlenames>] [-out <filedirectory>] [-prime[out] <filedirectory>] [-re[place]] [-ignoreco[lumns] <list of ranges to ignore>] [-ignoreb[lanks] <ltalt>] [-ignoreca[se]

[-ignoreu[nique] <filedirectory>] [-ignoreb[lanklines]] [-auto[merge]] [-nologo]

If you do not specify input parameters at the command prompt, a Merge Files GUI is presented to assist you in entering required and optional parameters. If only input and output ®les or directories are provided, the following command defaults will be in effect:

vThe output ®le or directory is not primed with one of the input ®les or directories.

vNo columns will be ignored in difference calculation.

vNo blanks will be ignored in difference calculation.

© Copyright IBM Corp. 1992, 1995, 1996, 1997, 1998

239

Image 259

IBM SC34-4499-03 manual Appendix C. TeamConnection Merge, 239

Contents

IBM Page IBM Fourth Edition March Contents Working with no component or release processes States of TeamConnection objectsWorking with component and release processes Creating and Maintaining Integrated Notes Databases Part 3. Using TeamConnection Notes Integrated DatabasesPart 4. Using TeamConnection to build applications Introduction to TeamConnection Integrated Notes DatabasesWorking with parsers Creating a parser Installing, starting, and stopping build serversWorking with build scripts and builders Working with MVS build scripts and buildersPart 5. Using TeamConnection to package products Appendix H. Supported expandable keywords Appendix G. Source Code Control Users GuideAppendix 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 Xvii About this bookHow this book is organized ConventionsTell us what you think Part 1. Introducing TeamConnection Users Guide An introduction to TeamConnection TeamConnections client/server architecture TeamConnection denitionsInterfaces TeamConnection databaseUsers and host lists FamiliesParts Check out ComponentsCheck Work areas ReleasesDrivers Processes Defects and featuresApproval BuildRoles people play System administratorFamily administrator PackagingEnd user Build administratorUsers Guide Part 2. Developing a product using TeamConnection Working with component and release processes Getting familiar with the TeamConnection client interfaces Using the GUITasks window Starting the GUIPerforming tasks with the GUI Stopping the GUIOn the GUI Using the Settings notebookOnline help information Using the command line interfaceUsing the TeamConnection web client Getting familiar with the TeamConnection client interfaces Users Guide Laying the groundwork Basics of using TeamConnectionComponents window Authority to perform tasksFinding parts Finding objects within TeamConnectionBuildView Using work areasPartFull Creating parts Naming your work areasPreparing to build your parts Naming your partsWorking with parts Working in serial or concurrent development modeDependent Working with common parts Your workstations current working directory Getting parts from TeamConnectionChecking parts in to TeamConnection Versioning releases Finding different versions of TeamConnection objectsVersioning work areas Versioning drivers Versioning parts Working with defects and featuresAnalyzing defects and features Designing the resolutionReviewing the design and resource estimates Testing and verifying part changesResolving defects and implementing features Verifying the resolution of the defect or featureUsers Guide Open state States of TeamConnection objectsComponent subprocesses Release subprocessesSize state Canceled stateReturned state Design stateWorking state Review stateVerify state Closed state Approve state States of work areasFix state Integrate state Test state States of driversRestrict state Commit stateRestrict state Verication and test records Users Guide Working in serial development Working with no component or release processesFor information about this task Go to this Accepting a defectCreating a work area CommandResult Create Work Areas window Checking out a partCheck Out Parts window Searching for a partPart Filter window Selects Save to Task ListEdit 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 updatesBuild Parts window Extract Parts window Extracting a partCheck Out Parts Checking out the part one more timeChecking the part back Now the work area contains the following parts Freezing the work areaRefreshing the work area Refresh Work Areas window Building the applicationIntegrating the work area Integrate Work Areas window Closing a defectVerify Defects window Working in concurrent developmentFollowing tasks are required Refreshing the work area from the driverFrom 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 ownershipAccepting a defect Approving Accept Approval Records window \robot\src in the Destination directory eld\robot\src in the Source directory eld Checking in the changesNow the work area contains the following part versions Teamc workarea -freeze 456 -release robotcontrol Building the application Complete Fix Records window Accepting x recordsAdding a driver member Integrating changed parts into a releaseReturning the work area to the x state Reconciling the differencesActivate Fix Records window Reactivating the x recordRefreshing the driver Refresh Drivers window Building the driverRestricting the driver Restrict Drivers window Integrating the partsComplete Drivers window Completing the driverAccept Test Records window Testing the built applicationRetrieving a past version of a part Using a congured processTeamc workarea -freeze 1208 -release robotcontrol Working with component and release processes TeamConnection system returns the following report 101 Part 3. Using TeamConnection Notes Integrated DatabasesUsers Guide Getting started Introduction to TeamConnection Integrated Notes Databases103 Prerequisites and dependencies Using TeamConnection with Lotus NotesSources of user information Database types User Dened Forms and subformsTest Case Management and Tracking GenericRequirements ViewsAll documents Document archiving ReviewsUsers Guide Creating and Maintaining Integrated Notes Databases Important notice to administrators111 Initializing the original template and creating a database Select Access Control Users Guide Select File-Save Select Administration-Document ControlCreating customized production databases Select Administration-Document Control Performing reconciliation From the File menu, select Database-Replace Design Database maintenance refreshing design from a templateImportant notice to administrators Database Design Strategies and Advanced Customization Rules of thumb and general advice121 Using the Customization setup facility Modify the document hierarchy Modify Database Optional InformationCommon Database Options Database-specic OptionsReconciliation of Notes and TeamConnection Data Modify TeamConnection AccessAdvanced customization Activate Reconcile Defects and FeaturesLog Document Options Users Guide Working with parsers Part 4. Using TeamConnection to build applications127 Basic build conceptsBuilding an application an example Physical structure of the build function Basic build concepts129 Builder Build object modelTeamConnection part Build eventOutput parts Parent-child relationships in a build treeBuild script Input partsUsers Guide Sample build object model for msgcat.exe Working with a build treeBuild tree for the hello application For more information about this task Go to this Putting the pieces togetherFor more information about this task Go to this 137 Installing, starting, and stopping build serversInstalling the build function Creating a build server on MVSCd JCL data set for load module Cd data set for teamproc jcl Creating a build server on MVS/OEStarting 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 serversUsers Guide Creating a builder Working with build scripts and builders147 Release Fromscriptfilespec -scriptnameEnvironment Parameters TimeoutWriting a build script Comparison operator and RC valueAs attributes of a builder Passing parameters to a build scriptAs attributes of a part in the build tree As parameters of the part -build commandWriting an executable le for a build script Writing a simple build scriptTesting a build script Putting a builder to work Modifying the contents of a build scriptModify Part Properties window Removing a builder from a partWorking with VisualAge C++ and Templates Users Guide Creating a builder for MVS builds Working with MVS build scripts and builders159 Builder File type none Script fhbc Script, File type, and Source leFile type none Script null Comparison operator are as follows ± EQ or == Equals Fhbmpli.jcl Writing an MVS build scriptFhbmasm.jcl Fhbcobm.jclPassing parameters to an MVS build script File name conversions for MVSTcbldusr TeamConnection syntax for MVS build scriptsKeyword parameters Supported JCL syntaxExec statement Positional parametersDD Statement Example of a build script for a C compile WELLSK.TEAMC.ERRORWorking with MVS build scripts and builders UNIT=SYSDA,SPACE=TRK,10,5 Example of a build script for a Cobol compileDCB=RECFM=FB,LRECL=80,BLKSIZE=3200 Example of a build script for a linkSysmod DD TCEXT=LOAD,DISP=NEW,DELETE Working with MVS build scripts and builders Users Guide Creating a parser Working with parsers175 Create Parser window IncludeWriting 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 exampleSample build tree Starting the build servers Creating the build tree for the application Creating builders and parsersMvspool Create Parts window Create Parts window Modify Part Properties window Connect Parts window Build tree display Starting the build on the clientBuild pool Build modeBuild target Work areaUnconditional Putting the build scripts to workDetail le name Monitoring the progress of a build Finishing the job and reporting the results to the userBuilding all parts, regardless of build times Running a build in spite of errorsFinding out which parts will be built Canceling a buildDening multiple outputs from a single build event More sample build treesHe creates the collector part Synchronizing the build of unrelated partsBuilding an application an example Users Guide Chapter Part 5. Using TeamConnection to package productsChapter Using TeamConnection to package a product 199Users Guide 201 Using TeamConnection to package a productSetting up a build tree for the gather tool Setting up your build tree for packagingShe also connects a readme le for the application Adding the gather step to the build tree Using the teamcpak command for the Gather tool Using the Gather tool205 String Command line ¯agsInputles Using the Gather tool Writing a package le for the Gather tool Examples of the teamcpak gather commandSyntax rules for a Gather package le Packageformat gather Keywords for a Gather package leTargetroot targetrootpath Source list of le specications Target Targetpath Using exit keywords in the Rule clause Using exit keywords in the Data clauseEXITPRIOR, EXITPOST, and Exitreplace String Package le looks like this Using exit keywords an exampleUsers Guide 215 Using the Tivoli Software Distribution packaging toolInputFile Writing a package le for Tivoli Software Distribution Example of the teamcpak softdist commandSyntax rules for a Tivoli Software Distribution package le Example Keywords for a Tivoli Software Distribution package lePackageformat softdist Nodes Installpgm Trace facility Sample package leLog le OptionProfile Using the Tivoli Software Distribution packaging tool Exit # end of file 225 Part 6. AppendixesUsers Guide 227 Appendix A. Environment VariablesNlspath Tcbuildpool Tccasesense Tcmakeimportverbose Tcrelease TeamConnection dynamically set build environment variables Setting environment variables 235 Appendix B. Importing makele information into TeamConnectionCreate le Modied makeleConnect le Connect ContentCreating a rules le Le maskComponent 239 Appendix C. TeamConnection MergeParameter Description Setting up your project options Creating a TeamConnection-enabled Workframe project241 Project actions Using your TeamConnection Workframe projectShow parts Part actionsView part information Edit partUsing your project a simple scenario Tcuser 245Tcbecome TC Build Part TC View Part ContentsTC Extract Part TC View Part InformationUsers Guide 249 Overview of the ENVY/Manager-TeamConnection BridgeScope of this documentation Preparing to use the ENVY/Manager-TeamConnection Bridge How the bridge communicates with TeamConnectionPrerequisites Setting up the bridge environmentEnvironment variables Loading the ENVY/Manager-TeamConnection Bridge Testing the ENVY/Manager-TeamConnection Bridge Setting default properties Using the ENVY/Manager-TeamConnection BridgeDefaults Operations ContextLocking Import Storage in TeamConnection ExportExporting Envy components to TeamConnection Replace existing lesExporting conguration maps and applications Importing Envy components from TeamConnection Exporting lesScenario assumptions Envy TeamConnectionVisualAge Generator Developer Build generation Object mapping in TeamConnectionTeamConnection build function TeamConnection change control Making a change to a memberTeamConnection change control Projects vs Families Appendix G. Source Code Control Users Guide267 Installing the TeamConnection source code control DLL Before you start Connecting TeamConnection to an IDEUsing TeamConnection as your source code control provider Removing the TeamConnection Source Code Control DLLOpening a project Integrated featuresUncheck-out Full features of TeamConnectionCheck-in Check-outMigrating project data bases Starting a new project Users Guide 275 Appendix H. Supported expandable keywordsThen 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 Sample Rexx execs Appendix J. Sample Rexx execs, build scripts, and parsers301 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 parsersInternet Customer support307 IBM TalklinkDB2 service maintenance and technical library IBM VisualAge TeamConnection Enterprise Server library Bibliography309 TeamConnection technical reports Glossary Related publicationsUsers Guide Contrast with Glossary313 Compare toUsers Guide Glossary End user. See user See also build dependentHPFS. See high-performance le system Users Guide Pool. See build pool Users Guide TeamConnection superuser. See superuser Users Guide 323 IndexBuilder 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 YouReaders Comments Ð Wed Like to Hear from You IbmrPage Ibmr