Differences

This shows you the differences between two versions of the page.

--- dr:cvs [2005/12/01 21:36] – updates.inc fgm
+++ dr:cvs [2020/11/23 17:23] (current) – external edit 127.0.0.1
@@ Line 2: / Line 2: @@
 (or a few notes on how to actually use cvs on drupal)
+  * [[http://www.ucolick.org/~de/CVSbeginner.html|Intro]]
   * [[http://cvsbook.red-bean.com/cvsbook.html#Introduction|RTFM]]
-  * checking out 4.6.4:
+  * checking out 4.6.4, 4.7 or HEAD:
-  zcvs -d co -rDRUPAL-4-6-4 drupal
+  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
@@ Line 14: / Line 17: @@
   * diff-ing our checked-out, then modified version with 4-6-4:
-  zcvs diff -rDRUPAL-4-6-4
+  dcv diff -rDRUPAL-4-6-4
   * building a patch:
   cd drupal;
-  zcvs diff -up > mychanges.patch
+  dcv diff -up > mychanges.patch
-  * zcvs is a 3-line script that just does this:
+  * history of a file (g2.module):
+  ccv log g2.module
+  * backporting (thanks to DWW):
+<code>
+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"
+</code>
+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
 <file>
   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% %*
+</file>
+    * ccv
+<file>
+  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% %*
 </file>