Page History

...

Merging back into develop and trunk

FIXME - code base now resides in git not SVN.

To merge the released code back into the develop develop branch.

• Check out the develop branch

  Code Block
  svn co https://svn.apache.org/repos/asf/flex/sdk/branches/developgit checkout develop

  Change to the newly checked out develop branch and test

• Test merging the release branch into the develop branch

  Code Block
  svngit merge --dryno-run merge https://svn.apache.org/repos/asf/flex/sdk/branches/commit --no-ff releaseX.Y.Z

• If no issues merge the release branch into the develop branch

  Code Block
  svngit merge https://svn.apache.org/repos/asf/flex/sdk/branches/--no-ff releaseX.Y.Z

• Check merged changes back into the remote develop branch

  Code Block
  svn ci -m "Merged Apache Flex X.Y.Z release branch"git push

To merge the released code back into the trunk.

• Check out the trunk

  Code Block
  svn co https://svn.apache.org/repos/asf/flex/sdk/trunk trunk

• Change to the newly checked out trunk and test merging the release branch into the trunk

  Code Block
  svn --dry-run merge https://svn.apache.org/repos/asf/flex/sdk/branches/releaseX.Y.Z

• If no issues merge the release branch into the trunk

  Code Block
  svn merge https://svn.apache.org/repos/asf/flex/sdk/branches/releaseX.Y.Z

• Check merged changes back into the trunk

  Code Block
  svn ci -m "Merged Apache Flex X.Y.Z release branch"

If you have timeout issues or SSL handshake errors check out and run the merge in your people.apache.org accountmaster branch, repeat the above steps using 'master' instead of 'develop'.

Tagging the Repository

Tag the release in git, the tag name and commit message with the relevant release information. You must ensure the source in the package matches the tag. Make sure you're on the 'master' branch when applying the tag.

...