Freeciv
Register
Advertisement

This document gives instructions to creation of stable branches from main branch.


Preparations well in advance[]

Patches to be applied to main and new stable branch immediately after branching should be written well in advance. They are submitted to patch tracker as any other patches and are subject to similar scrutiny as any other patch. Most importantly main branch patch bumps version number in fc_version, but documents require other changes as well. Things to update do change from release cycle to release cycle, but you should check patch from previous cycle for some reference. Patches for S3_2 branching, to start 3.3 cycle, are in osdn#44374.

Announce branching in i18n mailing list so translators can have their say if their translation should not be merged from previous stable branch for some reason.

Create modpack.list for the "test" datasubdir that the new stable branch will be using, to the freeciv.org server.

Branching[]

  1. Merge translations from previous stable release
  2. Update ChangeLog
    Instructions can be found from Release process documentation
  3. Create the new branch locally
    git checkout -b S3_x
  4. Apply stable branch patch prepared earlier to the stable branch, and push that as the initial branch to github
    git push origin S3_x
  5. Back in main branch, apply the main branch version bump patch prepared earlier
  6. Add links to files in new stable branch to Lua reference manual
Advertisement