History of bitweaverCVS
Version 18
Our CVS is hosted at SourceForge
Check out our groovy CVS Stats
Modules
The main CVS module is called tikipro. This will always point to the lastest HEAD revision of code and include the latest versions of the smarty and adodb libraries when checked out. This is what you should checkout in most cases for development work or to see the cutting edge of the code. Be warned that it may not be stable.
Other modules:
_adodb - the latest import and merge of the adodb library supported by TikiPro
adodb - same as _adodb, just placed in the lib directory.
_smarty - the latest import and merge of the smarty library supported by TikiPro
smarty - same as _smarty, just placed in the lib directory.
tiki - the pre-modular tiki 1.8 based core.
spidercore - the in progress modularizing of TikiPro. Doesn't inculde adodb or smarty
tikiprocore - the upcoming tikipro core without 3rd party libraries. This module does not yet exist.
Branches
As discussed in ReleaseProcess there are three active branches in cvs: STABLE, TESTING, and DEVELOPMENT. See ReleaseProcess for which branch is currently in which state.
DEVELOPMENT is the cvs trunk also known as HEAD.
Fixes in STABLE get merged into TESTING as needed.
Fixes in TESTING, including those from STABLE, get merged into HEAD as needed.
Several tags are maintained on DEVELOPMENT, TESTING, and STABLE to manage the merge process. In general you should simple checkout the latest version of the brach you are working on. See ReleaseProcess for what should be done where.
Format:
Check out our groovy CVS Stats
How is the TikiProCVS organized
Modules
The main CVS module is called tikipro. This will always point to the lastest HEAD revision of code and include the latest versions of the smarty and adodb libraries when checked out. This is what you should checkout in most cases for development work or to see the cutting edge of the code. Be warned that it may not be stable.
Other modules:
_adodb - the latest import and merge of the adodb library supported by TikiPro
adodb - same as _adodb, just placed in the lib directory.
_smarty - the latest import and merge of the smarty library supported by TikiPro
smarty - same as _smarty, just placed in the lib directory.
tiki - the pre-modular tiki 1.8 based core.
spidercore - the in progress modularizing of TikiPro. Doesn't inculde adodb or smarty
tikiprocore - the upcoming tikipro core without 3rd party libraries. This module does not yet exist.
Branches
As discussed in ReleaseProcess there are three active branches in cvs: STABLE, TESTING, and DEVELOPMENT. See ReleaseProcess for which branch is currently in which state.
DEVELOPMENT is the cvs trunk also known as HEAD.
Fixes in STABLE get merged into TESTING as needed.
Fixes in TESTING, including those from STABLE, get merged into HEAD as needed.
Several tags are maintained on DEVELOPMENT, TESTING, and STABLE to manage the merge process. In general you should simple checkout the latest version of the brach you are working on. See ReleaseProcess for what should be done where.
Format:
- Branch - Comment
- Tag - Comment
- Tag - Comment
- PURETIKI - Initial import of Tiki 1.8 for fork
- AL - Release 1
- AL_LASTMERGE - Point at which the most recent merge to HEAD took place.
- AL_NEXTMERGE - Point to which the next merge to HEAD will end. (Only used for a few minutes at a time while merging)
- AL_RC1 - Release Canidate 1
- AL_RC2 - Release Canidate 2
How merge to head is done:
In AL/tikipro directory:
cvs update -dP
cvs tag -c AL_NEXTMERGE
In merge/HEAD directory:
cvs -d :ext:btodoroff@cvs.sourceforge.net:/cvsroot/tikipro co tikipro
cd tikipro
cvs update -j AL_LASTMERGE -j AL_NEXTMERGE
cvs commit -m "Merge recent changes from AL into HEAD"
cd ..
rm -rf tikipro
Back in AL/tikipro directory:
cvs tag -r AL_NEXTMERGE -F AL_LASTMERGE
In AL/tikipro directory:
cvs update -dP
cvs tag -c AL_NEXTMERGE
In merge/HEAD directory:
cvs -d :ext:btodoroff@cvs.sourceforge.net:/cvsroot/tikipro co tikipro
cd tikipro
cvs update -j AL_LASTMERGE -j AL_NEXTMERGE
cvs commit -m "Merge recent changes from AL into HEAD"
cd ..
rm -rf tikipro
Back in AL/tikipro directory:
cvs tag -r AL_NEXTMERGE -F AL_LASTMERGE