Please wait

Backlinks

Page actions

Historically, we branch several weeks/months before an official release. However, it would also be possible to agree on a freeze and branch much later. Please add your arguments and preferences below.

Benefits of branching early (ex.: 4-6 weeks before)

Devs can still work on unfinished or new features

after all, not everyone may want to just fix, or would have to make himself familiar with unknown code first

(Psychological) Signal that freeze is in effect (only disadvantage in case if we do the way as in past merging to trunk is that people need to SVN switch, see below Merge or not to merge)

no accidental breaking code by devs not knowing of feature freeze (living in a bubble?)

clear and better controllable border between trunk and feature-freezed code

try on trunk. working? backport to branch

new and unexperienced devs won't have to fear of doing something really bad when working on trunk

Accept

Undecided

Reject

2

0

1

Kissaki

luci

marclaporte

Benefits of branching as late as possible

Less work of merging from branches/4 to trunk (in case we need to merge - see below)

and possibly the other way around

(Forcibly) Route manpower to only fixing and improving present and presently working (freezed) features.

When release is soon coming, new features can be done in an experimental branch (and merged into trunk later)

Accept

Undecided

Reject

2

2

1

jonnybradley

marclaporte

luci

Kissaki

sylvieg

After thinking about it more, because of the merges, I accept this only when I am forced to switch to work on 4.x branch after feature freeze — luci
But where do you commit the thing you are developping - innyour local or personal branches - and after do a bug commit where you lost the commit message? - sylvieg

Data

To help with decision making, it would be nice to have some historical perspective

Keywords

The following is a list of keywords that should serve as hubs for navigation within the Tiki development and should correspond to documentation keywords.

Each feature in Tiki has a wiki page which regroups all the bugs, requests for enhancements, etc. It is somewhat a form of wiki-based project management. You can also express your interest in a feature by adding it to your profile. You can also try out the Dynamic filter.