[PreViking-devel] previking and cvs branching

[Abdul-Wahid P. <aw...@gr...>]

The PreViking CVS has been branched from the 0.4.10 release. Upto now I 
have tagged all of the PreViking releases in the form of PV_X_Y_Z where 
X, Y and Z are the version numbers for PreViking. For the 0.4.10 branch 
I have make a seperate tag PV_0_4_10-BRANCH which is the branch point.

The reason for this is that we are now working on the 0.5.x branch 
(hopefully I can release 0.5 later this week) but 0.5.x is considered 
development code. 0.4.x will remain the stable code. If there are 
necessary bug fixes to the 0.4.x code tree they will be put onto the 
PV_0_4_10-BRANCH.


To make things easier I will list a few uses of cvs to save you guys 
searching on how to do things yourselves.

To check out the 0.4.10 branch

cvs co -r PV_0_4_10-BRANCH

or if you are already on the head you can do

cvs update -r PV_0_4_10-BRANCH

To change back to the HEAD of the cvs do

cvs update -A

To see the diff of a file between the head and the branch do

cvs diff -r PV_0_4_10-BRANCH

To join (merge) a file from the branch to the head do (whilst you have 
the HEAD checked out)

cvs update -j PV_0_4_10-BRANCH filename.c

Then commit the filename.c in the usual way

cvs commit filename.c



I hope that helps.


Abdul-Wahid