Difference for ./cvshowto.txt from version 1.1 to 1.2


version 1.1 version 1.2
Line 3
 
Line 3
 1) cd <your source dir>  1) cd <your source dir>
   
 2) cvs -d ":pserver:<username>@pyropilots.org:/usr/src/cvsroot" checkout d1x  2) cvs -d ":pserver:<username>@pyropilots.org:/usr/src/cvsroot" checkout d1x
   this will retrieve the source into <current dir>/d1x    This will retrieve the source into <current dir>/d1x
   (you may wish to look into the -z flag, ex "-z9" to compress the code for    (you may wish to look into the -z flag, ex "-z9" to compress the code for
   faster transmission)    faster transmission)
   Unless you already know your username, you want "readonly".  When prompted for    Unless you already know your username, you want "readonly".  When prompted for
Line 11
 
Line 11
   
 3) Make your changes and stuff.  (Test them too).  3) Make your changes and stuff.  (Test them too).
   
 4) you probably want to do a 'cvs update' before commiting, to make sure your  4) You will want to do a 'cvs update' before commiting, to make sure your
   changes still work with any other changes that may have been commited while    changes still work with any other changes that may have been commited while
   you were working.    you were working.
   
 5) if you have readonly access:  5) If you have readonly access:
     If you have only modified existing files, this should generate a usable diff:
     cvs -q diff -uRN . > mychanges.patch
     (hopefully you would use a more useful name, and remember to examine the
     result first, to make sure its ok.)
     If you have added files or directories, this won't be as useful since you
     can't use the 'cvs add' command to get cvs to recognize them.  In this case
     you should diff manually, or just zip up the new files.
   
     Once you have the patches/zips made, the best way to get them included is to
     post a message to the descent-source list with the files attached, or an url
     to the files. (see notes below)
    
   -or- if you have full cvs access:
      
 -or- if you have full access:  
   cvs commit <changed file>    cvs commit <changed file>
   or, if you want to commit all changes (in current, and sub dirs), just:    or, if you want to commit all changes (in current, and sub dirs), just:
   cvs commit    cvs commit
Line 25
 
Line 37
   will be ignored.  If you want to add a new file, use 'cvs add <file>')    will be ignored.  If you want to add a new file, use 'cvs add <file>')
   
   
   Notes:
   It is highly recommend that all developers subscribe to the descent-source
   mailing list.  To signup, send an email to majordomo@warpcore.org with
   "subscribe descent-source your@email.address" in the body.
    
   To those with full cvs access: only Vic and I (Matt) will handle the commiting
   of patches posted to the list, in order to avoid any problems.
   
 If some of your changes are too close to other peoples, update or commit may  If some of your changes are too close to other peoples, update or commit may
 cause a "conflict".  You should probably talk with whoevers code it conflicts  cause a "conflict".  You should probably talk with whoevers code it conflicts
 with, unless the solution is obvious.  with, unless the solution is obvious.
   
   
 Of course, this is only a brief overview.  It is recommended you browse the CVS  Of course, this is only a brief overview.  It is recommended you browse the CVS
 documention as well. (info cvs, or equivilant).  If you have questions, or this  documention as well. (info cvs, or equivilant).  If you have questions, or
 howto could use some clarification, feel free to ask.  think this howto could use some clarification, feel free to ask.

Legend:
line(s) removed in v.1.1 
line(s) changed
 line(s) added in v.1.2