You are viewing an old version of this page. View the current version.

Compare with Current View Page History

« Previous Version 4 Next »

LCLS How-to- Branch a Release

The following instructions describe how to use CVS branching for releasing.  These instuctions were taken from an email by Till Straumann.

Let's say you have a release (tag Vacuum-R4-1-0) in production. Then you discover a bug which is fixed on the HEAD

  1. Create a patch ( .diff file) which fixes the bug.
  2. Create a branch of production release:   cvs rtag -b -r Vacuum-R4-1-0  Vacuum-R4-1-0-BRANCH Vacuum
  3. Update or checkout branch into the directory devl:   cvs co -r Vacuum-R4-1-0-BRANCH -d  devl  Vacuum
  4. Apply the patch from step 1, resolve any failures or conflicts.
  5. Compile and tag
  6. Commit:   cvs commit
  7. Tag appending "Pn" to the tag from which you branched, where N is the patch number starting at 0:  cvs tag Vacuum-R4-1-0-P0
  8. Update or checkout new patch level release
  9. Compile and install
  10. Repeat above steps for all releases/patches that are in production.
  • No labels