| 26 | | is contributing to the latest development version of the 0.3 release (and synchronises regularly with it). |
| 27 | | |
| 28 | | Once the main trunk release turned into 0.4, no code from branches with 0.3.x release numbers will be merged into trunk anymore. |
| 29 | | |
| 30 | | Version numbers in branches in turn do not have to correlate with the main trunk version, i.e. |
| 31 | | |
| 32 | | - 0.3.24-vita |
| 33 | | |
| 34 | | can contribute to 0.3.3 in the main trunk. |
| 35 | | |
| 36 | | However, odd (or no) version numbers of branches indicate a "not ready for merge", while even numbers indicate "can be merged", i.e. |
| 37 | | |
| 38 | | - 0.3.24-vita can be merged into 0.3.3 trunk, whilst |
| 39 | | - 0.3.25-vita is not ready to be merged |
| 40 | | |
| 41 | | To indicate a "ready for merge", write the release and version numbers of the branch on the top of the bzr commit log. |
| | 26 | uses the code from the 0.3.6 trunk version. Hence, if the branch is branched off another branch, it has to use the same version number as the original. |
