- 0 Talk
-
Branching
This document gives instructions to creation of stable branches from trunk.
Preparations well in advance
Edit
Patch to be applied to TRUNK immediately after branching should be written well in advance. It's submitted to patch tracker as any other patch and is subject to similar scrutiny as any other patch. Most importantly this 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. Patch applied after S2_4 was branched, to start 2.5 cycle, are patch #2902 and patch #3025
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.
Branching
Edit
1. Merge translations from previous stable release
2. Update ChangeLog
Instructions can be found from Release process documentation
3. Branch
svn cp svn+ssh://svn.gna.org/svn/freeciv/trunk svn+ssh://svn.gna.org/svn/freeciv/branches/S2_x
4. Apply TRUNK version bump patch prepared earlier
5. Update PEOPLE up to last commit mentioned in new ChangeLog