Re: I wanna hooooold your hand (or have mine held)

On Tue, 12 Mar 2002, Tim Gallagher wrote: > I've made a lot of changes (the diff file I've made is 295k) to the PHPDoc > package, and have been told by Ulf to commit the changes to cvs. The only > kicker is that I've never used cvs before. Never really used diff > (stumbled my way through), and need some hand holding to figure this > out. I'm sure I need a cvs account (Stig ... ?) Hi Tim, I think that the changes need some work. Specifically, there are some problems with the CSS code. This is a shot of how http://www.smur.net/knife/doc/ renders in Konqueror 2.9.9 and Mozilla 0.9.8. http://ozma.union.utexas.edu/~busterb/snapshot1.png Perhaps there are some Internet Explorer or font-specific changes in the CSS that causes the pages to render incorrectly in both browers? Do your changes overwrite the old template files, or work in addition to them? I would not want to lose the old template files. Also, did you notice that the phpdoc file in cvs currently performs the same tasks as your revised index.php, just from the command-line? I was just wondering why you were changing the index.php for every project anyway, when the command-line interface was there. I viewed the current index.php as just an example, not something to really use. > So.... > I'm comfortable with linux, but I'm using windows, i have win32 apps of cvs > and diff though (command line versions) > I have access to linux if I must use that, but I'd prefer to do this all on > my local desktop without having to telnet in to my linux box. > > My biggest fear is that I'll really screw something up. (like delete all of > pear cvs or something like that) > > Anybody out there want to answer a bunch of questions, and/or send a > *simple* tutorial? There are lots of tutorials (not many simple ones though) out there, but the first thing I did while learning CVS was to setup a test repository on my local machine and play with it before trying anything in the real world. I had a team that worked with CVS for a semester. I sent the members this quick tutorial, but it was specific to our project, though you might get some use from it. This is the tutorial we used: http://www.cs.utexas.edu/users/s2s/latest/number1a/home/cvs.ps These were the team-specific instructions. Part 1 You need to set the CVSROOT environment variable. If you know what I'm talking about when I say to do this, then set it and go to Part 2. Otherwise, read on. An environment variable is a kind of global variable that your shell keeps track of and passes to programs. Your shell is the thing that interprets what you type in an x-term or from a telnet session and runs programs (and a lot more). The first thing you need to do is determine what type of shell you use. You probably either use tcsh or bash. To determine this, you can type the command: env | grep SHELL If you use tcsh, use the command: setenv CVSROOT /u/www/users/s2s/08-2-CVS if you want to have this command run everytime you log in, add it to your ~/.login file. If you use bash, use the command: export CVSROOT=/u/www/users/s2s/08-2-CVS if you want to have this command run everytime you log in, add it to your ~/.profile file. It's probably a good idea if you don't know how to use the vi text editor to also edit your .login or .profile file and edit the lines that define the VISUAL and EDITOR environment variables to a simpler editor like pico. This will make writing change logs in CVS easier for you. Of course, learning vi would also make things simpler. Log out and log back in to see changes to your .profile or .login file. Part 2 OK, with CVSROOT set, you can checkout files from the CVS repository. First, decide which module you want to checkout. We have three: home, doc and src. home contains the web page files, doc contains all of the documents and src the current source code for the game. Say you want to edit the current SRS. Checkout the doc directory: cvs co doc This creates a copy of the doc module in your home directory. You should be able to cd ~/doc into this directory and make your edits. When you are done, go back into your home directory and type: cvs ci doc CVS will decide which files you have changed and ask you to add a log entry for each file. It will automatically start whatever text editor for those comments you defined with EDITOR. If you just want to check in a single file rather than have CVS decide which files have changed, use this command: cvs ci doc/SRS-v1.1.html You can also specify the log entry for that file inside the command like this: cvs ci -m "Fixed some spelling errors" doc/SRS-v1.1.html To see the log entries for a file, use a command like this: cvs log doc/SRS-v1.1.html That's really you need to get started with CVS. Of course, there is a lot more to it, but the tutorial I mentioned above along with experience will do you much more good than anything I can say here.