Including Changes in CASA Release-4_2_2

This page describes how to include changes in to the CASA 4.2.2 release.



Work not already started on trunk

  1. Use test data from https://svn.cv.nrao.edu/svn/casa-data/branches/release-4_2.
    • This is already on the CV and DSOC Linux networks in /home/casa/data/branches/release-4_2.
  2. Check out the release branch from https://svn.cv.nrao.edu/svn/casa/branches/release-4_2_2.
  3. Complete change.
  4. Test change.
  5. svn commit -F svnmerge-commit-message.txt
    • The commit message will contain a list of commit messages for the merged changes.
  6. Watch for feedback from Jenkins.
  7. Watch for feedback from package testing.

Iterate as necessary.

Work already started, or complete, on trunk

Self Merge

If you prefer to merge your work yourself, follow this procedure.

  1. List Subversion revisions to be merged from trunk to release-4_2_2.
    • Group by build component
      • casacore
      • code
      • gcwrap
  2. Use svnmerge to merge changes from trunk to release-4_2_2.
  3. Use test data from https://svn.cv.nrao.edu/svn/casa-data/branches/release-4_2
    • This is already on the CV and DSOC Linux networks in /home/casa/data/branches/release-4_2
  4. Check out the release branch from https://svn.cv.nrao.edu/svn/casa/branches/release-4_2_2
    • For each [build component] in casacore, code, gcwrap. asap will be handled separately.
    1. cd [build component]
    2. svnmerge avail -S /trunk/[build component]
      • Verify the changes listed in #1 above appear in this list. If not, it may have already been merged or blocked from merging.
      • To see if a change has been merged recently, run
        • svn propget svnmerge-integrated | grep trunk | grep [change]
          • If this command finds your change, it has already been merged.
      • To see if a change has been blocked recently, run
        • svn propget svnmerge-blocked | grep trunk | grep [change]
          • If this command finds your change, it has been blocked from merging. Contact Scott Rankin to find out why.
      • If you still do not see the change, it may have been merged less recently. To verify, run
        • svn log | grep [change] # To save time, press ctl-C as soon as you see a result.
          • If this command finds your change, it has already been merged.
          • If this command does not find your change, contact Scott Rankin.
    3. svnmerge merge -r -S /trunk/[build component]
    4. Test change.
    5. svn commit -F svnmerge-commit-message.txt
      • The commit message will contain a list of commit messages for the merged changes.
    6. Watch for feedback from Jenkins.
    7. Watch for feedback from package testing.

Merge by Scott Rankin

  1. List Subversion revisions to be merged from trunk to release-4_2_2.
    • Group by build component
      • casacore
      • code
      • gcwrap
  2. Work with Rob to incorporate this list into a sub page under https://safe.nrao.edu/wiki/bin/view/Software/CASA/Casa422Patch
  3. Rob will inform me when the new subpage is ready to merge.

-- ScottRankin - 2014-04-07
Topic revision: r3 - 2014-04-10, ScottRankin
This site is powered by FoswikiCopyright © by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
Ideas, requests, problems regarding NRAO Public Wiki? Send feedback