(See also MergingPagesForOmniMigration)

Begin with merge of ONLINE21_BRANCH

 First

• Small team (say Alan and Chris) to lead the merge with help from others. This will hopefully prevent too-many-cooks syndrome and allow us to keep track of the merge status.
• Freeze ONLINE21_BRANCH.
  • Done -- provided everybody pays attention to the mail that was sent!
• Tag the head of ONLINE21_BRANCH in its frozen state as MERGE_POINT_A1
  • Done
• Freeze HEAD.
  • Done -- provided everybody pays attention to the mail that was sent!
• Tag the point at which ONLINE21_BRANCH split from HEAD as MERGE_POINT_C0
  • Done
• Tag HEAD in its pre-merge frozen state as MERGE_POINT_C2
  • Done.

 Then

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

package	who merging	status	Note1	Note2	Note3
AnalysisService	Chris	done	builds
ArchivingService	Chris	done	builds
build	Alan	done 6/8/04	builds SCT
CalibrationController	Chris	done	builds
config	Chris	done	untested
daq-1	Alan	done 6/8/04	builds
decodeTestStand	Chris	done
docs	Alan	done	no changes
exampleSetup.csh	Alan	done
exampleSetup.sh	Alan	done
FittingService	Alan	done 6/8/04	builds
GuiComponents?	Alan	done 9/8/04	builds	almost too easy?
Makefile	Chris	done
MiniUtils	Alan	done	build + unit test
README	Alan	done 6/8/04	no change
SCT	Alan	done 6/8/04
SctApi	Chris	in cvs	very fishy -- seemed to have already been merged
SctApiIPC?	Chris	done	builds
sctConf	Alan & Chris	Alan copied from online21, but Chris rolled it back to where it came from, and merged (hopefully) all changes from A1->C2 (the usual route) as there were fewer of them to do that way, than to merge all the C0->C2 changes by Bruce into the A1 copy.		No longer needs changes C0->C2, hopefully.
sctConfIPC	Alan & Chris	done	comments as for sctConf	ditto
SCTData	Chris	done	builds
SctDataDisplay?	Alan	done 6/8/04	builds
sctddc-00-00-02	Chris	Builds	untested
sctGUI	Chris	done	untested
SctService	Alan	done 6/8/04	builds
SCTTestAPI?	Chris	done	untested
setup.csh	Chris	done
setup.sh	Chris	done
start	Chris	done
SummaryWriter?	Alan	done	no changes
SystemTests	Alan & Chris	Done	I think Alan may have already done this package before he went off on conference, but he never committed it, so I did it again as he was uncontactable ( Chris )
TestGUI?	Chris	done

 Then

• Tag HEAD once the above merge is complete as MERGE_POINT_C3
  • Done.

Then proceed with merge of SctRodDaq_3_0_BRANCH ...