History of bitweaverCVS

Version 32

bitweaverCVS

Developer Management of TikiPro Source Code

Created by: spiderr, Last modification: 17 May 2004 (21:43 UTC) by spiderr
Our CVS is hosted at SourceForge

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

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

Page History
Date/CommentUserIPVersion
26 Mar 2008 (15:37 UTC)
spiderr66.194.217.22167
Current • Source
spiderr69.134.148.4065
View • Compare • Difference • Source
Jerry Russell66.25.205.23264
View • Compare • Difference • Source
laetzer217.83.93.21163
View • Compare • Difference • Source
xing81.223.107.22361
View • Compare • Difference • Source
dspt217.21.50.16760
View • Compare • Difference • Source
xing194.152.164.4559
View • Compare • Difference • Source
xing194.152.164.4558
View • Compare • Difference • Source
xing194.152.164.4557
View • Compare • Difference • Source
xing194.152.164.4556
View • Compare • Difference • Source
xing194.152.164.4555
View • Compare • Difference • Source
Stephan Borg218.214.1.11354
View • Compare • Difference • Source
xing194.152.164.4553
View • Compare • Difference • Source
xing194.152.164.4552
View • Compare • Difference • Source
Stephan Borg218.214.1.11351
View • Compare • Difference • Source
xing194.152.164.4549
View • Compare • Difference • Source
laetzer84.191.93.21948
View • Compare • Difference • Source
Stephan Borg218.214.1.11347
View • Compare • Difference • Source
Stephan Borg218.214.1.11346
View • Compare • Difference • Source
spiderr68.125.207.11345
View • Compare • Difference • Source
spiderr66.93.240.20444
View • Compare • Difference • Source
spiderr66.93.240.20443
View • Compare • Difference • Source
spiderr66.93.240.20442
View • Compare • Difference • Source
spiderr66.93.240.20440
View • Compare • Difference • Source
spiderr66.93.240.20439
View • Compare • Difference • Source
spiderr66.93.240.20438
View • Compare • Difference • Source