History of bitweaverCVS

Version 40


Developer Management of TikiPro Source Code

Created by: spiderr, Last modification: 17 Jun 2005 (22:12 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


Our CVS tree has a cvs module for each package. However, a virtual CVS module is use to create our two primary distributions: tikipro and tikilite. Every TikiProRoadMap has a CVS branch named after it. The branch is create AFTER we have gone into schema freeze for the project.

To get code for ReleaseClyde, you want to check out the code from Sourceforge.
Developer Access: If you are you a member of the TikiPro project then you should (NOTE!! Make sure you "export CVS_RSH=ssh" in your /etc/profile or CVS shell first):
cvs -d :ext:yourusername@cvs.sf.net:/cvsroot/tikipro co clyde
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 clyde

To get the latest and greatest code from cvs HEAD ( currently ReleaseClyde ), don't use any tags at all:
cvs -d :ext:yourusername@cvs.sf.net:/cvsroot/tikipro co tikilite
cvs -d :ext:yourusername@cvs.sf.net:/cvsroot/tikipro co 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.

To update a library, here is an example for adodb:
Download and untar the latest version. cd into the adodb dir just unpacked then:
cvs -qz5 -d:ext:btodoroff@cvs.sourceforge.net:/cvsroot/tikipro import -I ! -m"Import adodb 4.20 from ADODB directly" _adodb ADODB ADODB_420


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.

  • Branch - Comment
    • Tag - Comment
    • Tag - Comment

HEAD - Current Mainline

  • This is the leading edge of development.

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
In merge/HEAD directory:
cvs -d :ext:btodoroff@cvs.sourceforge.net:/cvsroot/tikipro co tikipro
cd tikipro
cvs commit -m "Merge recent changes from BONNIE into HEAD"
cd ..
rm -rf tikipro
Back in BONNIE/tikipro directory:

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 date="" plus="" year:="" yyyy-mm-dd=""><release> tikipro
cvs rtag -r <release><release>_LASTMERGE tikipro

Including 3rd party code in CVS

How merge to HEAD is done:

Let's say we want to import the excellent database abstraction layer
ADOdb version 4.60 into our CVS repository:

$ wget http://phplens.com/lens/dl/adodb360.tgz
$ tar xvzf adodb360.tgz
$ rm adodb360.tgz
$ cd adodb
$ cvs import -m 'Imported ADOdb 4.60' _adodb PHPLENS_COM R4_60
$ cd ..
$ rm -fr adodb

Now, we're going to check it out from CVS and fix a bug we found:

$ cvs checkout _adodb
$ cd _adodb
...hack, chop, whittle...
$ cvs commit -m "Fixed bug #12345: Replace doesn't use native REPLACE command, if available"
$ cd ..
$ rm -fr _adodb

Now, we want to upgrade to version 4.62:

$ wget http://phplens.com/lens/dl/adodb462.tgz
$ tar xvzf adodb462.tgz
$ rm adodb462.tgz
$ cd adodb
$ cvs import -m 'Imported ADOdb 4.62' _adodb PHPLENS_COM R4_62

This command completed successfully, but reported the following:

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -j -jR4_62 _adodb

So, let's delete the imported directory:

$ cd ..
$ rm -fr adodb

And checkout as instructed above.

$ cvs checkout -jR4_60 -jR4_62 _adodb

Manually resolve any conflicts that were reported.

Now, let's commit our 4.60 changes into 4.62:

$ cvs commit -m 'Merged our 4.60 changes into 4.62'

And finally remove our directory:

$ rm -fr _adodb

(Source: http://tikiwiki.org/tiki-index.php?page=UsingLibrariesInCVS)
Page History
26 Mar 2008 (15:37 UTC)
Current • Source
View • Compare • Difference • Source
Jerry Russell66.25.205.23264
View • Compare • Difference • Source
View • Compare • Difference • Source
View • Compare • Difference • Source
View • Compare • Difference • Source
View • Compare • Difference • Source
View • Compare • Difference • Source
View • Compare • Difference • Source
View • Compare • Difference • Source
View • Compare • Difference • Source
Stephan Borg218.214.1.11354
View • Compare • Difference • Source
View • Compare • Difference • Source
View • Compare • Difference • Source
Stephan Borg218.214.1.11351
View • Compare • Difference • Source
View • Compare • Difference • Source
View • Compare • Difference • Source
Stephan Borg218.214.1.11347
View • Compare • Difference • Source
Stephan Borg218.214.1.11346
View • Compare • Difference • Source
View • Compare • Difference • Source
View • Compare • Difference • Source
View • Compare • Difference • Source
View • Compare • Difference • Source
View • Compare • Difference • Source
View • Compare • Difference • Source
View • Compare • Difference • Source