For our purposes, we hope we don't have to do many merges, we are most interested in keeping older versions of everything.
Most of this README was taken directly from:
Additional information was taken from:
For information from the authorities on cvs:
Go to a new/empty directory and execute the command:
cvs checkout ppd/assembler
The ppd directory will still be checked out, but only the specified subdirectory ("assembler" in this case) will be in it.
cvs checkout -r version module
cd ppd/doc; cvs checkout -r 1.1 manual.txt
cvs checkout -r 1.1 ppd/doc/manual.txt (less common usage)
cvs -H command_name # general help for a command cvsup # 'cvs up -dP' cvsed dff.mag # locks and edits file cvsuned dff.mag # unlocks and unedits file cvs update -d # include any new directories cvs update -P # prune out empty directories cvs --help-commands cvs --help remove # to remove a file from cvs rm file cvs remove file cvs commit tkdiff -r1.3 -r1.4 mem_fifo_pipe.v # to compare two revisions of a file To remove sticky tag and sticky options (from web page) cvs status filename # check status first cvs update -A filename # Sticky Tag should be cleared cvs admin -kkv filename # no noticeable change to status apparently! cvs update -A filename # Sticky Options should be cleared (strange!) cvs update -D 9/10/2004 # check out a particular date cvs update -D "9/10/2004 17:15" cvs update -R -D "2004/09/11 17:00" # works, needs quotes, recursive