History of bitweaverCVS
Version 32
bitweaverCVS
Developer Management of TikiPro Source Code
Our CVS is hosted at SourceForge
Check out our groovy CVS Stats
An introduction to CVS use on SourceForge is Basic Introduction to CVS and SourceForge.net Project CVS Services.
Information on usage of SourceForge CVS is in Section F of the SourceForge Docs page.
Developer Access: If you are you a member of the TikiPro project then you should:
cvs -d :ext:yourusername@cvs.sf.net:/cvsroot/tikipro co -r BONNIE tikipro
General Access: If not, you can get anonymous access. Note this method users a mirrored CVS and has a 24+ code delay with the :ext: method indicated above.
cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/tikipro co -r BONNIE tikipro
_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.
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
CVS Introduction
An introduction to CVS use on SourceForge is Basic Introduction to CVS and SourceForge.net Project CVS Services.
Information on usage of SourceForge CVS is in Section F of the SourceForge Docs page.
How is the TikiProCVS organized
Modules
The CVS module is aptly called "tikipro". Every TikiProRoadMap has a CVS branch named after it. So, to get code for ReleaseBonnie, you want to check out the code from Sourceforge.Developer Access: If you are you a member of the TikiPro project then you should:
cvs -d :ext:yourusername@cvs.sf.net:/cvsroot/tikipro co -r BONNIE tikipro
General Access: If not, you can get anonymous access. Note this method users a mirrored CVS and has a 24+ code delay with the :ext: method indicated above.
cvs -d :pserver:anonymous@cvs.sf.net:/cvsroot/tikipro co -r BONNIE tikipro
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.
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/HEAD
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
Bonnie - Release 2
- BONNIE - Release 2
- BONNIE_LASTMERGE - Point at which the most recent merge to HEAD took place.
- BONNIE_NEXTMERGE - Point to which the next merge to HEAD will end. (Only used for a few minutes at a time while merging)
AL - Release 1
- AL - Release 1 - No longer Maintained
- 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 Candidate 1
- AL_RC2 - Release Candidate 2
- PURETIKI - Initial import of Tiki 1.8 for fork
Version Merging
How merge to HEAD is done:
In BONNIE/tikipro directory:
cvs update -dP
cvs tag -cF BONNIE_NEXTMERGE
In merge/HEAD directory:
cvs -d :ext:btodoroff@cvs.sourceforge.net:/cvsroot/tikipro co tikipro
cd tikipro
cvs update -j BONNIE_LASTMERGE -j BONNIE_NEXTMERGE
cvs commit -m "Merge recent changes from BONNIE into HEAD"
cd ..
rm -rf tikipro
Back in BONNIE/tikipro directory:
cvs tag -r BONNIE_NEXTMERGE -F BONNIE_LASTMERGE
In BONNIE/tikipro directory:
cvs update -dP
cvs tag -cF BONNIE_NEXTMERGE
In merge/HEAD directory:
cvs -d :ext:btodoroff@cvs.sourceforge.net:/cvsroot/tikipro co tikipro
cd tikipro
cvs update -j BONNIE_LASTMERGE -j BONNIE_NEXTMERGE
cvs commit -m "Merge recent changes from BONNIE into HEAD"
cd ..
rm -rf tikipro
Back in BONNIE/tikipro directory:
cvs tag -r BONNIE_NEXTMERGE -F BONNIE_LASTMERGE
How a release branch is created
In <Release> directory:
cvs -d:ext:..... co tikipro
In <Release>/tikipro directory:
cvs update -dP
cvs rtag -b -D <Today's Date Plus 1 Year: YYYY-MM-DD> <Release> tikipro
cvs rtag -r <Release> <Release>_LASTMERGE tikipro
In <Release> directory:
cvs -d:ext:..... co tikipro
In <Release>/tikipro directory:
cvs update -dP
cvs rtag -b -D <Today's Date Plus 1 Year: YYYY-MM-DD> <Release> tikipro
cvs rtag -r <Release> <Release>_LASTMERGE tikipro