|
|
|
| - | {DIV(class="lead well")}Once you have read up on how to ((commit code)), a very important decision is __where to commit__? Stable-LTS, Stable, Dev (trunk on SVN / master on Git), or experimental? You may want to checkout the ((tw:Versions)) page.See also: ((Freeze and Slush)) and ((Git and SVN Combined Workflow)){DIV} |
+ | {include page="SVN deprecation notice"}{DIV(class="lead well")}A very important decision is __where to commit__? Stable-LTS, Stable, Dev (--trunk on SVN-- / master on Git), or experimental? You may want to checkout the ((tw:Versions)) page.See also: ((Git Workflow)) and ((Freeze and Slush)){DIV} |
| | ! Dashboard | | ! Dashboard |
| - | Quick overview intended to help to know where to commit to right now in most situations. See [#Branches| Branches section] below for more detailed explanations. |
+ | Quick overview intended to help to know __where to commit to right now__ in most situations. See [#Branches_Again| Branches section] below for more detailed explanations. |
| - | {BOX(title="Current status" align="left")}* __Automatic merging is ongoing__ (a.k.a. ((Semi-automatic merging period))) ** Fixes and translations ''only'' to go into 20.x first, any enhancements need to go in trunk/master** For example if you want to make a fix to 15.x LTS, please commit the fix to 20.x first then backport to 19.x, and then to 18.x and finally to 15.x. For more details, see the table below.** During this period, changes to trunk/master increase the risks of ((merge conflicts)). To minimize this risk, non-functional changes (e.g. code formatting, code documentation and other refactoring) which are not specific to trunk/master only and which can be postponed should be avoided. ''In particular, automated code reformatting in batch (many files at once) should be postponed.''~tc~* All commits need to start in trunk/master** For example if you want to make a fix to 12.x LTS, please commit the fix to trunk/master first then backport to 18.x, and then to 15.x and finally to 12.x. For more details, see the table below.~/tc~ |
+ | {BOX(title="Current status" align="left")}* __All [[FIX]es and [[TRA]nslations__ should go into master and then cherry-picked to 25.x and other major versions when applicable.* __New features and enhancements__ need to go in master now for inclusion in 26.x (or possibly 25.1+).** For example if you want to make a fix to 21.x LTS, please commit the fix to 25.x first then cherry-pick to master and then to 24.x. For more details, see the table below. |
| | * __Upcoming releases__: | | * __Upcoming releases__: |
| - | ** ''20.0, 19.2, 18.4 LTS, 15.8 LTS and 12.15 LTS will be the next versions released.'' |
+ | ** ''25.0, 24.3, 21.8 LTS, 18.10 LTS will be the next versions released.'' |
| | {BOX} | | {BOX} |
| | Commit status and order for each open branch: | | Commit status and order for each open branch: |
| - | {FANCYTABLE(head="__I want to commit to:__ | __What is allowed:__ | __Commit first to:__ | __Afterwards , backport to:__")}__trunk/master__ (future 21x) | Functional enhancements, new features | |__20x__ | Fixes and translations only | | 19.x__19x__ | Fixes and translations only (during 20.0 freeze) | trunk | 18.x__18x__ | Fixes and translations only LTS | 19.x | 15.x__15x__ | Fixes only LTS |18.x| 12.x__12x__ | Critical fixes only LTS | 15.x| |
+ | {FANCYTABLE(head="__I want to commit to:__ | __What is allowed:__ | __Commit first to:__ ")}__master__ (future 26x) | Functional enhancements, new features, fixes and translations | |__25.x__ | Bug fixes only until ((Tiki25|25.0 is released)) and merge to master | |__24.x__ | Bug fixes only until ((Tiki25|25.0 is released)) | 25.x, master |__21.x__ | Security fixes only LTS | 25.x, master, 24.x |__18.x__ | Security fixes only LTS | 25.x, master, 24.x, 21.x | |
| | {FANCYTABLE} | | {FANCYTABLE} |
| | ! Branches Again | | ! Branches Again |
| - | ''Root:'' [https://svn.code.sf.net/p/tikiwiki/code/] |
+ | ''Root:'' [https://gitlab.com/tikiwiki/tiki] or [https://svn.code.sf.net/p/tikiwiki/code/] |
| | ||''Name''|''BRANCH''|''Comments'' | | ||''Name''|''BRANCH''|''Comments'' |
| - | Dev|[https://svn.code.sf.net/p/tikiwiki/code/trunk/|trunk]/[https://gitlab.com/tikiwiki/tiki/commits/master|master](will become 21.x branch in future) |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.~tc~ after the ((Semi-automatic merging period)) has ended.~/tc~ %%% Also: {MOUSEOVER(label="Update language strings")}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.{MOUSEOVER}. If you commit to trunk/master, and after you want to commit to a stable branch, please see how to ((Merge a commit from trunk|merge a commit from trunk/master)).__Stable__|[https://svn.code.sf.net/p/tikiwiki/code/branches/20.x/|branches/20.x] |__Fixes only__ - Auto-merged to trunk/master.__Previous Stable__|[https://svn.code.sf.net/p/tikiwiki/code/branches/19.x/|branches/19.x] |__Fixes only__ until after 20.0 backported from 20.x __Stable LTS__|[https://svn.code.sf.net/p/tikiwiki/code/branches/18.x/|branches/18.x] |__Fixes only__ until after 20.0 backported from 19.x__Previous Stable LTS__|[https://svn.code.sf.net/p/tikiwiki/code/branches/15.x/|branches/15.x] |__Security and bug fixes. __ Backport from 18.x.Previous Stable LTS|[https://svn.code.sf.net/p/tikiwiki/code/branches/12.x/|branches/12.x]|__Only security fixes and translations. __ Backport from 15.x.((Experimental branches))|[https://svn.code.sf.net/p/tikiwiki/code/branches/experimental/|many]|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.|| |
+ | Dev|[https://svn.code.sf.net/p/tikiwiki/code/trunk/|trunk]/[https://gitlab.com/tikiwiki/tiki/commits/master|master](will become 26.x branch in future) |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.~tc~ after the ((Semi-automatic merging period)) has ended.~/tc~ %%% Also: {MOUSEOVER(label="Update language strings")}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.{MOUSEOVER}. If you commit to master, and after you want to commit to a stable branch, please see how to ((Merge a commit from trunk|merge a commit from master)).Next __Stable__|[https://gitlab.com/tikiwiki/tiki/-/tree/25.x|branches/25.x] | __Fixes and Translations only until 25.0 is released__ cherry-picked from master/main/trunk__Stable LTS__|[https://gitlab.com/tikiwiki/tiki/-/tree/24.x|branches/24.x] | __Fixes and Translations only until 25.0 is released__ cherry-picked from master/main/trunk__Previous Stable LTS__|[https://svn.code.sf.net/p/tikiwiki/code/branches/21.x/|branches/21.x] |__Minor safe enhancements, fixes and translations__ backported from 24.x.__Legacy Stable LTS__|[https://svn.code.sf.net/p/tikiwiki/code/branches/18.x/|branches/18.x] |__Fixes only__ backported from 21.x((Experimental branches))|Now happening on GitLab forks|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 branch should create a [https://gitlab.com/help/user/project/merge_requests/index.md|Merge Request] when it's ready (or a WIP MR before it's ready if you like.||Legend:* STS: Standard Term Support* LTS: Long Term SupportSee ((Version lifecycle)) |
| | ! Definition of "security-only" phase | | ! Definition of "security-only" phase |
| | ! Other notes | | ! Other notes |
| - | * Commits to LTS must have been developed and tested previously on higher branches (at least trunk/master) unless they do not apply there (for example, a fix to a feature that was removed later). See [Quality+Team#What_will_be_considered|here] for more info. |
+ | * Commits to LTS must have been developed and tested previously on higher branches (at least master) unless they do not apply there (for example, a fix to a feature that was removed later). See [Quality+Team#What_will_be_considered|here] for more info. |
| | * The community will handle merges from stable to dev, with help from a merging script during ((Semi-automatic merging period)) | | * 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)) | | * 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)) |
| | * 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)) | | * 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)) |
| | * https://trunkbaseddevelopment.com/ | | * https://trunkbaseddevelopment.com/ |
| | + | ! Related |
| | + | * ((Commit Code)) |
| | + | * ((Commit Tags)) |
| | + | * ((Commit Guidelines)) |
| | + | * ((Git Workflow)) |
| | ! Legacy | | ! Legacy |
| - | __There are no more planned releases of versions prior to 12, as well as versions 13, 14, 16 and 17.__ If you are running one and commit a fix , please merge manually your fix to the appropriate branch. |
+ | __There are no more planned releases of versions prior to 14, as well as versions 16, 17 and 19, 20 and 22.__ If you are running one and commit a fix , please merge manually your fix to the appropriate branch. |
| | !- Examples | | !- Examples |
| | {CODE} | | {CODE} |
| - | * This is not a fix or a security issue. Minor code improvements should be made in trunk/master. |
+ | * This is not a fix or a security issue. Minor code improvements should be made in master. |
| | {CODE(wrap=>1)} | | {CODE(wrap=>1)} |
| | * __ROLLBACK__ | | * __ROLLBACK__ |
| - | * This commit changes a desired behavior and may break the release. Changes should be discussed with original authors and any decided changes are to be made in trunk/master. |
+ | * This commit changes a desired behavior and may break the release. Changes should be discussed with original authors and any decided changes are to be made in master. |
| | * All changes in branches/2.0 need to be safe and fully tested with all related features, including translation and staging. | | * All changes in branches/2.0 need to be safe and fully tested with all related features, including translation and staging. |
| | {CODE} | | {CODE} |
| - | * Simple code enhancements, should be made in trunk/master |
+ | * Simple code enhancements, should be made in master |
| | {CODE(wrap=>1)} | | {CODE(wrap=>1)} |
| | [UI FIX] objectperms: switch perms and perms descriptions | | [UI FIX] objectperms: switch perms and perms descriptions |
| | {CODE} | | {CODE} |
| - | * Cosmetic change, should go in trunk/master |
+ | * Cosmetic change, should go in master |
| | Alias names of this page: | | Alias names of this page: |
| - | (alias(WhereToCommit)) |
+ | (alias(WhereToCommit)) | (alias(Where)) |
;){kind=link}
;){kind=link}
;){kind=link}
;){kind=link}