配置管理工具 Concurrent Versions System

ConcurrentVersionsSystemUserguideforCS408ConcurrentVersionsSystemPurposeConcurrentdevelopment•Sharingsourcecodes•DetectingconflictscausedbyconcurrencyVersioncontrol•Retainingchangehistory–Changeofsourcecode–Changelog•Tagging–Storingfullsourcecodeatanevent–Lettingdeveloperswitchsourcecodeattheevent•Branching–Managingtwoormoredevelopmentstreamsforasourcecode»Stableversionvs.newerversion2BranchstrategySinglestreammodelDualstreammodelMultistreammodel3•Branchingatemergency•TwobranchesaremanagedDevelopmentbranchMainbranch•Branchingatemergencyinmainstream•Developmentbranchismergedintomainstreamateachreleasepoint•MultiplebranchesaremanagedDevelopmentbranchMainbranch•Branchingatemergencyinmainstream•DevelopmentbranchesaremergedintomainstreamateachreleasepointInthiscourse,wewillusesinglestreammodelUserguide(1/8)Overview4Sourcecode(notinrepository)CVSRepositoryDeveloper’sworkspaceSourcecode(inrepository)Sourcecode(inworkspace)ImportCheckout(initialtime)UpdateCreatenewworkspaceCommitAddAdditionalsourcecode(notinrepository)DeleteLoginConfigurationitemsNon-configurationitemsUserguide(2/8)CVSROOTAddressforcvsrepositorySyntaxforpserver•:pserver:id@server_address/cvsroot_directoryLoginLoginandsetcredentialinlocalcomputerLoginmustbeexecutedbeforeimportorcheckoutUsage•cvs-dCVSROOTloginExample•Enteringthecommand5Userguide(3/8)ImportUploadsourcecodetocvsrepositoryUsage•cvs-dCVSROOTimportmodule_namevendor_taginitial_tagExample•Enteringthecommand•Writelogfortheimport6Userguide(4/8)CheckoutDownloadsourcecodefromcvsrepositoryUsage•cvs-dcvsrootcheckoutmodule_nameExample•Enteringthecommands(includinglogincommand)7Userguide(5/8)UpdateUpdatelocalsourcecodeUsage•cvsupdateoptionsExample•Enteringthecommand(REParser.javawasmodifiedbyothers)8Userguide(6/8)AddAddfilesordirectoriestoconfigurationitemsUsage•cvsaddfilesordirectoriestoaddExample•AddedFile.javaisnewlycreatedbyprogrammer•Enteringthecommand9Userguide(7/8)DeleteRemovefilesordirectoriesfromconfigurationitemsUsage•cvsdeletefilesordirectoriestodeleteExample•Removingthefilesordirectories•Enteringthecommand10Warning!!!ToreflectAddandDeletecommandstoCVSrepository,CommitcommandmustbeexecutedUserguide(8/8)CommitCommitchangesoflocalsourcecodetocvsrepositoryUsage•cvscommitExample•Enteringthecommand•Writinglogs11Advanceduserguide(1/5)LogWhen?•CommitareimportcommandsrequirewritinglogWhy?•LogcanhelptotracechangesWhat?•Nameofonewhoimportorcommit•Reason•Extrainformation12Advanceduserguide(2/5)Conflict13CVSRepositorySourcecodeversion1.0Sourcecodeversion1.1Developer2Sourcecodeversion1.0**Sourcecodeversion1.0Developer1Sourcecodeversion1.0Sourcecodeversion1.0*UpdateUpdateChangeChangeCommitCommitConflictTimeSourcecodeversion1.0**ofdeveloper2shouldalsobeversion1.1.Advanceduserguide(3/5)ConflictexampleDeveloper1insertinsertedMethod1toREParser.javaDeveloper2insertinsertedMethod2toREParser.javaDeveloper1commitDeveloper2commitThenDeveloper2meetsfollowingerrormessages14Advanceduserguide(4/5)ResolvingconflictExecuteUpdatecommandOpentheconflictfile15ConflictfileAddedbyhimself(developer2)Addedbyothers(developer1)Advanceduserguide(5/5)EditingtheconflictfileExecuteCommitcommand16Inthiscase,developer2decidestoremainbothmethodsCVSconfigurationinformationCVSServeraddressviper.kaist.ac.kr(143.248.188.6)CVSROOTpathTeam1:김선영류승균염혜원이수현최준수강창헌•/cvsroot/cs408_1Team2:AndriiShyshkalov,하세훈,장영진,AutretGuillaume,VivienHouet•/cvsroot/cs408_2Team3:이준희안재민박정훈김병수이해봄•/cvsroot/cs408_3Team4:AntoninGercier,NideyeAmyDieng,전종윤,이지은,류한승•/cvsroot/cs408_4Team5:김민국박지훈심영준이종협한성욱•/cvsroot/cs408_5Team6:ErdenefuyaG,백한나조승범정민기장연일•/cvsroot/cs408_5Team7:서상현주은광윤주현박웅최미나•/cvsroot/cs408_717