[ernesto@jaguar Merger]$ cvs log Makefile RCS file: /usr/local/lcls/cvsRepo/epics/modules/asyn/Makefile,v Working file: Makefile head: 1.1 branch: 1.1.1 locks: strict access list: symbolic names: asyn-ANL-R4-16: 1.1.1.1 asyn-ANL-R4-9: 1.1.1.1 asyn-ANL: 1.1.1 keyword substitution: kv For SLAC: The initial vendor tag is what we shall use: : 1.1.1 Note that this is basically the very first symbolic tag after doing the initial import. All other tags are release tags If we were doing this properly, we would have been maintaining our external packages via importing the new releases and doing the proper merge operations. Hence, for existing modules that we have brought from the outside we will identify the and then merge against the latest For asyn, VENDOR_TAG = ASYN LATEST_RELEASE_TAG = asyn-R4-9-lcls6 When we are complete, the latest merge asyn code will be on our main trunk. Once we have it on the main trunk will create a new SLAC production CVS tag. (1) Download new module from external site into your sandbox (2) cvs import -m "initial import of asyn R4-16 from ANL" epics/site/src/asyn ASYN asyn-ANL-R4-16 104 conflicts created by this import. Use the following command to help the merge: cvs -d :ext:ernesto@noric01.slac.stanford.edu:/afs/slac/g/lcls/cvs checkout -j -j asyn-ANL-R4-16 epics/site/src/asyn (3) cd to your sandbox cvs co -d Merger -j asyn-R4-9-lcls6 -j asyn-ANL-R4-16 epics/site/src/asyn (4) cd to Merger cvs -n update Now go ahead and commit all files that have the "M" status Be sure to commit the Added files as well "A" status Next make a decision on any removed files "R" status Finally, resolve any files with conflicts "C" status (5) Do a diff to check how close your merge is with the downloaded external package diff -r External Merger |more [ernesto@jaguar Merger]$ cvs -n update |grep M ernesto@noric01.slac.stanford.edu's password: cvs update: Updating . cvs update: Updating asyn cvs update: Updating asyn/asynDriver R README M asyn/Makefile cvs update: Updating asyn/asynGpib M asyn/asynDriver/asynDriver.h M asyn/asynDriver/asynManager.c M asyn/asynDriver/epicsInterruptibleSyscall.c cvs update: Updating asyn/asynRecord M asyn/asynGpib/asynGpib.c cvs update: Updating asyn/devEpics M asyn/asynRecord/asynRecord.c cvs update: Updating asyn/devGpib M asyn/devEpics/devAsynFloat64.c M asyn/devEpics/devAsynInt32.c M asyn/devEpics/devAsynUInt32Digital.c M asyn/devEpics/devAsynXXXArray.h cvs update: Updating asyn/drvAsynSerial M asyn/devGpib/devSupportGpib.c cvs update: Updating asyn/gsIP488 M asyn/drvAsynSerial/drvAsynIPPort.c M asyn/drvAsynSerial/drvAsynIPServerPort.c M asyn/drvAsynSerial/drvAsynSerialPort.c cvs update: Updating asyn/interfaces cvs update: Updating asyn/linuxGpib cvs update: Updating asyn/miscellaneous cvs update: Updating asyn/ni1014 M asyn/miscellaneous/asynInterposeEos.c M asyn/miscellaneous/asynPortDriver.cpp M asyn/miscellaneous/asynPortDriver.h M asyn/miscellaneous/asynShellCommands.c cvs update: Updating asyn/vxi11 cvs update: Updating asyn/vxi11/rpc M asyn/vxi11/drvVxi11.c cvs update: Updating configure cvs update: Updating documentation M configure/CONFIG M configure/RELEASE M configure/makeIncludeDbd.pl cvs update: Updating documentation/HowToDoSerial M documentation/KnownProblems.html M documentation/RELEASE_NOTES.html M documentation/asynDriver.html M documentation/asynDriver.pdf M documentation/asynPortDriver.html M documentation/asynRecord.html M documentation/asynRecord.pdf M documentation/devGpib.pdf cvs update: Updating documentation/HowToDoSerial/AB300 cvs update: Updating documentation/HowToDoSerial/AB300/AB300App cvs update: Updating documentation/HowToDoSerial/AB300/AB300App/Db cvs update: Updating documentation/HowToDoSerial/AB300/AB300App/src M documentation/HowToDoSerial/tutorial.tex cvs update: Updating documentation/HowToDoSerial/AB300/AB300Sup cvs update: Updating documentation/HowToDoSerial/AB300/configure cvs update: Updating documentation/HowToDoSerial/AB300/iocBoot cvs update: Updating documentation/HowToDoSerial/AB300/iocBoot/iocAB300 cvs update: Updating documentation/asynDoxygenHTML cvs update: Updating documentation/gpibCoreConversion cvs update: Updating html cvs update: Updating html/HowToDoSerial cvs update: Updating html/asynDoxygenHTML cvs update: Updating html/gpibCoreConversion cvs update: Updating iocBoot cvs update: Updating iocBoot/ioctest cvs update: Updating iocBoot/ioctestAsynPortDriver cvs update: Updating iocBoot/ioctestEpicsM iocBoot/ioctestAsynPortDriver/Makefile M iocBoot/ioctestAsynPortDriver/st.cmd cvs update: Updating iocBoot/ioctestGpib cvs update: Updating iocBoot/ioctestGpibSerial cvs update: Updating iocBoot/ioctestGpibSerialVx cvs update: Updating iocBoot/ioctestGpibVx cvs update: Updating iocBoot/ioctestIPServer cvs update: Updating iocBoot/ioctestManager cvs update: Updating makeSupport cvs update: Updating makeSupport/app cvs update: Updating makeSupport/app/_NAME_App cvs update: Updating makeSupport/app/_NAME_App/Db cvs update: Updating makeSupport/app/_NAME_App/src cvs update: Updating makeSupport/devGpib cvs update: Updating makeSupport/devGpib/_NAME_Sup cvs update: Updating makeSupport/devGpib/documentation cvs update: Updating makeSupport/softioc cvs update: Updating makeSupport/softioc/configure cvs update: Updating makeSupport/softioc/iocBoot cvs update: Updating makeSupport/softioc/iocBoot/_IOCNAME_ cvs update: Updating makeSupport/streamSCPI cvs update: Updating makeSupport/streamSCPI/_NAME_Sup cvs update: Updating makeSupport/streamSCPI/documentation cvs update: Updating makeSupport/top cvs update: Updating makeSupport/top/configure cvs update: Updating makeSupport/vxioc cvs update: Updating makeSupport/vxioc/configure cvs update: Updating makeSupport/vxioc/iocBoot cvs update: Updating makeSupport/vxioc/iocBoot/_IOCNAME_ cvs update: Updating medm cvs update: Updating testApp cvs update: Updating testApp/Db cvs update: Updating testApp/adl cvs update: Updating testApp/src cvs update: Updating testAsynPortDriverApp cvs update: Updating testAsynPortDriverApp/Db cvs update: Updating testAsynPortDriverApp/adl cvs update: Updating testAsynPortDriverApp/src cvs update: Updating testEpicsApp cvs update: Updating testEpicsApp/Db cvs update: Updating testEpicsApp/adl cvs update: Updating testEpicsApp/src cvs update: Updating testGpibApp cvs update: Updating testGpibApp/Db cvs update: Updating testGpibApp/adl cvs update: Updating testGpibApp/src cvs update: Updating testGpibSerialApp cvs update: Updating testGpibSerialApp/Db cvs update: Updating testGpibSerialApp/src cvs update: Updating testIPServerApp cvs update: Updating testIPServerApp/Db cvs update: Updating testIPServerApp/adl cvs update: Updating testIPServerApp/src cvs update: Updating testManagerApp