Page Comparison

...

cd sakai_2-3-x-test-029
svn commit -m "Adding revisions to externals : UCD=r1244 FND=r20974 dav=r22183"

Production

Instructions for Creating Production SmartSite Tag

1. Look at Tuesday Code Migration Meeting Notes for items in Testing Completed or Awaiting Migration to Smartsite. Move anything from Testing Completed to Awaiting Migration to Smartsite that has passed QA and will be migrated that weekend. Only move things that say Passed without any issues. Unclear issues must generally be discussed at the next Tuesday meeting.
2. One the smartsite-test-2.3.x page, mark the tickets that are being rolled into prod. Marking is done with the symbol.
3. Note the revision numbers for the tickets we are marking.
4. Open Eclipse with the Groovy merge scripts. Right click the project with the scripts and select Team->Update to make sure they are up to date.
5. Open SvnCreateMergeCommands.groovy and update START_REVISION and END_REVISION. The revision numbers were noted above from smartsite-test-2.3.x. Where n is the lowest affected revision number and m is the highest affected revision number, set START_REVISION = n-1 and EDN_REVISION = m. Make sure to remove from excludeModules list anything that we are updating.
6. Execute the SvnCreateMergeCommands.groovy by right clicking the code and selecting Run As->Groovy.
7. Check out current prod branch:

   Code Block
   svn co https://mware.ucdavis.edu/svn/ucd-sakai/sakai/branches/sakai_2-3-x-prod/

   or, if you already have the working directory for sakai_2-3-x-prod:

   Code Block
   svn revert -R * svn update

8. Run the merge command generated by groovy. Do one tickets worth of merges before committing. For example:

   Code Block

   /usr/local/bin/svn merge -r 955:956 https://mware.ucdavis.edu/svn/ucd-sakai/sam/branches/sakai_2-3-x sam (Sometimes there are more than one but never merge more than one JIRA's merges between commits. Take notes and be careful to know exactly which merge you are on in this case) svn commit -m "SAK-587 : Samigo: SAK-6990 - Addressing incorrect password issue with timed assessments, timer erroneously starts on failed authentication : /usr/local/bin/svn merge -r 955:956 https://mware.ucdavis.edu/svn/ucd-sakai/sam/branches/sakai_2-3-x sam" sam

9. Update Change Management of sakai_2-3-x-prod page.

   Code Block
   h4. r1261 2007-05-04 * SAK-587 : Samigo: SAK-6990 - Addressing incorrect password issue with timed assessments, timer erroneously starts on failed authentication ** svn merge -r 955:956 https://mware.ucdavis.edu/svn/ucd-sakai/sam/branches/sakai_2-3-x sam

   Note that the revision number is the result of the commit of the JIRA.
   If mistakes are made in the merging process, note all affected revisions on the Change Management of sakai_2-3-x-prod page. It's important to cross reference, and put it in both affected places in case something needs to be pulled out.
10. Create a prod tag:

    Code Block
    svn copy https://mware.ucdavis.edu/svn/ucd-sakai/sakai/branches/sakai_2-3-x-prod/ https://mware.ucdavis.edu/svn/ucd-sakai/sakai/tags/sakai_2-3-x-prod-007 -m "Creating sakai_2-3-x-prod-007 : UCD=r1261 FND=r20974"

11. Start to checkout the prod tag:

    Code Block
    svn co https://mware.ucdavis.edu/svn/ucd-sakai/sakai/tags/sakai_2-3-x-prod-007

12. Run the externals command:

    Code Block
    svn propedit svn:externals sakai_2-3-x-prod-007

13. Delete everything in that file.
14. Run the SvnExternal_2_3_x-prod.groovy with proper revision numbers. Copy everything that results and paste into the empty file from above.
15. Commit

    Code Block
    cd sakai_2-3-x-prod-007 svn commit -m "Adding revisions to externals: UCD=r1261 : FND=r20974"