Working with SVN

Some time ago when FESA3 was first established at GSI it was decided to work with release branches for each release. This allows to make the necessary modifications for a release such as changes in the makefiles and the configuration files in the branch while keeping a development version in the trunk.

Once a release is confirmed the sources for this release are tagged. If bugfixes (patches) have to be applied to a release the changes should be tagged as well.

The SVN structure looks as follows:

trunk	contains a (potentially unstable) development version
branches > release >> FESA3_0.x.1 >> FESA3_1.x.0 ...	contains the release versions
tags > release-0.x.1 > release-1.x.0 > release-1.x.0-patch<x>	contain the 'finalized' release version

Below the SVN folders are the FESA projects (fesa-codegen, fesa-core, etc).

Working on a Release

• Create a new release branch from the sources in the trunk using the planned FESA version number
• Replace DEV from the development version in the make- and configuration files by the FESA version of this release
• Fix the bugs that occur during release creation
• If necessary, merge the changes from the release back to the development trunk

Merge from the Release Branch into the Trunk

• Make sure the working copy of the trunk is up to date
• In Eclipse: Select the project to be merged (Team>Merge...)
• In Eclipse: Select the URL from the project in the release branch
• In Eclipse: Accept or edit the changes merged from the release branch
  • ensure the version numbers in makefiles and configuration files stay DEV because some may have trouble with such changes
• In Eclipse: Commit the changes from the release branch to the trunk.

How to create a Tag

• In Eclipse: Select the project to be tagged (Team>Tag...)
• On the command line: svn copy -m "Release tag for FESA3 x.x.x" https://www-acc.gsi.de/svn/fesa/framework/branches/release/FESA3_${FESA_LOCATION} https://www-acc.gsi.de/svn/fesa/framework/tags/release-$FESA_VERSION

-- SolveighMatthies - 25 Aug 2015