Fullscreen
[Show/Hide Right Column]

Where to commit? Type of page »  Developers documentation
Print

Where to commit

  • You have fixed something?
  • You have added a feature?
  • You want to share back?


The goal is to make the feature as generic as possible so it may be used in various contexts. Also, we must be sure it doesn't duplicate another existing feature.

A very important decision is where to commit? Stable-LTS, Stable, Dev (trunk), Mods or experimental? You may want to checkout the RoadMap and Version lifecycle.

Branches


Root: https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/

NameBRANCHCurrent numberComments
Stable-LTS branches/6.x 6.6 Only security fixes and backports approved by the Quality Team. See the Quality Team page more details on the procedure. Translations are OK as well.
Proposals/6.x branches/proposals/6.x will become 6.7 Fixes from trunk that you would like to be considered for inclusion in minor releases for version 6 LTS, once approved by the Quality Team. Commits to proposals must have been developed and tested previously on higher branches (at least trunk) unless they do not apply there (for example, a fix to a feature that was removed later). See here for more info.
Stable branches/8.x 8.3 Bug and regression fixes. Minor feature enhancements with little risk of regression are OK. After the Semi-automatic merging period, make sure to manually merge a commit to trunk.
Stable branches/9.x soon Bug and regression fixes. Minor feature enhancements with little risk of regression are OK. After the Semi-automatic merging period, make sure to manually merge a commit to trunk.
Dev trunk will become 10.0 Most development (new features) happens here. New features, need to be functional, but don't need to be complete. In theory, should be releasable at any time. This is the place for refactoring. Cosmetic code changes should be done here after the Semi-automatic merging period has ended. Also: Update language stringsIf you must change the English version (but are not changing the meaning and so the translations are still valid, please use mass spelling correction. If you can't use that, just add to pending text corrections. . If you commit to trunk, and after you want to commit to a stable branch, please see how to merge a commit from trunk.
Mods mods in trunk n/a If your feature is too specific or too experimental for the main branch, it can go into mods. Please read: To Mods Or Not To Mods. There are no branches for mods.
Experimental branches many n/a All developments for things that are not stable enough yet or just intended as proof of concept before the real work starts. These branches will never become a released branch directly, the author of the experimental branch must move the functionality in the Dev branch when it's ready.

Other notes

  • The community will handle merges from stable to dev, with help from a merging script during Semi-automatic merging period
  • On stable branches, try to avoid any changes to the database as this complicates things and increases possibilities for errors. If you must, please see: Database Schema Upgrade
  • If you must change the English version (but are not changing the meaning and so the translations are still valid, please use mass spelling correction. If you can't use that, just add to Pending text corrections
  • If we are close to a release, and you have a change with a risk of regression, try to consult the release manager.
  • There are some things that are black and white and there are many shades of gray. In case of doubt, ask on the Dev Mailing List


Legacy

1.9.x, 2.x, 3.xLTS, 4.x, 5.x and 7.x
There are no more planned releases of these versions. If you are running one and commit a fix , please merge manually your fix to the appropriate branch.

Examples

[+]

Page last modified on Friday 30 March, 2012 03:04:16 UTC

SourceHistoryComments

Search Wishes (subject only) [toggle]

Categorize where to commit

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.