dr:cvs
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revision | |||
dr:cvs [2006/04/23 08:53] – fgm | dr:cvs [2020/11/23 17:23] (current) – external edit 127.0.0.1 | ||
---|---|---|---|
Line 1: | Line 1: | ||
+ | ====== CVS for drupal crash test dummies ====== | ||
+ | (or a few notes on how to actually use cvs on drupal) | ||
+ | * [[http:// | ||
+ | * [[http:// | ||
+ | |||
+ | * 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, | ||
+ | |||
+ | 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 " | ||
+ | </ | ||
+ | |||
+ | 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=" | ||
+ | set ACCESS=-d: | ||
+ | %CMD% %ACCESS% %* | ||
+ | </ | ||
+ | * ccv | ||
+ | < | ||
+ | set CMD=" | ||
+ | set ACCESS=-d: | ||
+ | %CMD% %ACCESS% %* | ||
+ | </ | ||
+ | |||
+ | * when patching the database, | ||
+ | * create a function in updates.inc to update existing files | ||
+ | * diff the database\database.< |