Semi-automatic merging period

As per Version lifecycle, Tiki has two major releases per year.

Thus, there is the creation of two new branches per year. For a 4 to 8 week period after branching, there is a a stabilization period during which there is a merging from branch to trunk using a script. When to branch is decided by the Release Coordinator

This period typically ends when merging becomes too difficult, because the code in trunk starts to differ significantly. This is usually the time to proceed to the x.1 release and for the Quality Team to go in "strict mode".

During this period, it's best to avoid massive changes (refactoring, code cleanups, re-indenting. etc.) on trunk because it makes merging more difficult. If you want/need to do, please also do the merges.

All developers should upgrade their sites during this period as bug fixing is very efficient.

Merging from stable to trunk

1. Check-out trunk
2. Run `php doc/devtools/svnbranchupdate.php branches/version_number`
   • Example: php doc/devtools/svnbranchupdate.php branches/9.x
3. Fix conflicts and commit using `svn commit -F svn-commit.tmp`.

[demotw@alpha trunk]$ php doc/devtools/svnbranchupdate.php branches/9.x
Verifying...
Updating...
Merging...
svn: Write error: Broken pipe
--- Merging r35997 through r36007 into '.':
U    lib/wiki-plugins/wikiplugin_addtogooglecal.php
After verifications, commit using `svn ci -F svn-commit.tmp`

You can ignore the message "svn: Write error: Broken pipe".

If you are new to this and don't want to have a conflict to resolve: wait for someone else to merge and then do your changes on 7.x and right after, merge to trunk.

If you are outside this period, you can manually merge a commit: Merge a commit to trunk

• Semi-automatic merge period