BlankMergePage

(See also MergingPagesForOmniMigration)

 First

• Freeze SctRodDaq_3_0_BRANCH
  • Chris sent mail 5th November asking all developers to cease commitals till this part of the merge is complete.
• Tag SctRodDaq_3_0_BRANCH in frozen state as MERGE_POINT_B2
  • Done
• Freeze HEAD
  • Chris sent mail 13th August asking all developers to cease commitals till this part of the merge is complete.
• Tag HEAD in its pre-merge frozen state as MERGE_POINT_C6
  • To be Done

 Then

• Merge all (not already merged) changes between MERGE_POINT_B1 and MERGE_POINT_B2 into HEAD, one package at a time. Keep a record of progress below:

package	who merging	status	Note1	Note2	Note3
AnalysisService	Chris
ArchivingService	Chris
build	Chris
CalibrationController	Chris
config
daq-1	Chris
decodeTestStand
docs
exampleSetup.csh	Chris
exampleSetup.sh	Chris
FittingService	Chris
GuiComponents?	Chris
logs
Makefile	Chris
MiniUtils	Chris
README	Chris
SCT	Chris
SctApi	Chris
SctApiIPC?	Chris
sctConf	Chris
sctConfIPC	Chris
SCTData	Chris
SctDataDisplay?	Chris
sctddc-00-00-02	Chris
sctGUI	Chris
SctService	Chris
SCTTestAPI?	Chris
setup.csh	Chris
setup.sh	Chris
start	Chris
SummaryWriter?	Chris
SystemTests	Chris
TestGUI?	Chris
webscripts	Chris

 Then

• Tag HEAD once merge from SctRodDaq_3_0_BRANCH is complete as MERGE_POINT_C7
  • To be done