CVS for drupal crash test dummies

(or a few notes on how to actually use cvs on drupal)

Intro
RTFM

checking out 4.6.4, 4.7 or HEAD:

dcv co -rDRUPAL-4-6-4 drupal
dcv co -rDRUPAL-4-7 drupal
dcv co -rHEAD drupal

* the newly checked-out version will be available after a

cd drupal

diff-ing our checked-out, then modified version with 4-6-4:

dcv diff -rDRUPAL-4-6-4

building a patch:

cd drupal; 
dcv diff -up > mychanges.patch

history of a file (g2.module):

ccv log g2.module

backporting (thanks to DWW):

cvs co -r DRUPAL-4-7 modules/g2
cd modules/g2
cvs update -j 1.13 -j 1.15 g2.module
(resolve conflicts, if any)
cvs commit -m "backporting changes from HEAD" g2.module"

the key step in that command is the “cvs update -j”, which means to merge the revisions you specified into your current working copy.

dcv/ccv is a 3-line script that just does this:
- dcv

  set CMD="e:\Program Files\Zend\ZendStudioClient-5.0.0\bin\SourceControl\cvs\cvs.exe"
  set ACCESS=-d:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal
  %CMD% %ACCESS% %*

  set CMD="e:\Program Files\Zend\ZendStudioClient-5.0.0\bin\SourceControl\cvs\cvs.exe"
  set ACCESS=-d:pserver:someuser:hispassword@cvs.drupal.org:/cvs/drupal-contrib
  %CMD% %ACCESS% %*

when patching the database,
- create a function in updates.inc to update existing files
- diff the database\database.<engine> files used for initial site creation