All about the Tikiwiki 1.10 branch, named arcturus

If you are a random website maintainer

You will have the possibility very soon to upgrade your 1.9 tikiwiki version to 1.10 one. You can help the development if you can test the release candidate and participate to the Bugfix Community Hunt. The released packages includes an upgrade script in tiki-install.php file, just browse it and ensure the you understand the changes in the category permissions introduced in Tikiwiki 1.10.

If you are a tikiwiki contributor

Then there are 2 cases :

• you worked with 1.9 mainly. Maybe even you have uncontributed code in your custom tiki, damnit, that's too late now only bugfixes are accepted in 1.9 branch. Merges with 1.10 have already been not guaranteed anymore for a while, so any bug fixes not in 1.10 should be done as part of the RC cycle.

How to switch a branch to 1.10. Make a full backup first!

The CVS instructions below no longer apply. See http://dev.tikiwiki.org/tiki-index.php?page=SVNTips for checking out 1.10 from SVN

This can generate conflicts if you made local changes, so, if it's on production code, do it on a copy.

Now that we are in the middle of a beta: Please see 110Beta2Plan

If it is a bug fix

Go right ahead to commit to SVN 1.10 branch. If it fine-tunes what is there with clear benefit to user (so long as it has no risk of causing new bugs) go right ahead. If it is revamp or a new thing, please ask the release manager (nkoth) (on IRC is probably easiest) before committing.

You have a very experimental new thing that will change the world.

Stick it on the TRUNK branch (refer to 110Beta2Plan, don't change anything, it will be in 1.11. Frequent merges will feed the TRUNK branch with bugfixes on 1.10 code.

If you want to merge your own commits

(The following tools need to be updated for SVN. They were designed for CVS, which the 1.10 branch has now moved away from)

It's quite advisable to merge your own commits, because you are the most able to resolve conflicts if any occur. There is a script for that. It have been tested for years but it was mainly displaying lines that was copypasted by the merger, just to check at each steps that everything went fine. Now that we know how it flows, we made this script interactive. It assumes that you run on GNU/linux as a development platform, and have bash installed. Read the file doc/devtools/tikimerge_110to111.sh so you can know how to setup your environment to fit this script if your context is special.