RE: Newbie
The definitive guide: http://www.loria.fr/~molli/cvs/doc/cvs.pdf The HTML version: http://www.loria.fr/~molli/cvs/doc/cvs_toc.html Quick Reference commands: http://www.fido.de/kama/cvsmtp/en/cvs-en_153.html#SEC153 General: http://www.fido.de/kama/cvsmtp/en/cvs-en_186.html#SEC186 -Original Message- From: Annette Waters [mailto:[EMAIL PROTECTED]] Sent: Monday, July 10, 2000 11:25 AM To: '[EMAIL PROTECTED]' Subject: Newbie Hello all! I'm new to CVS and am trying to find as much information as possible on using it. I come from a heavy ClearCase background. Can anyone suggest a good book, documentation that will help me? Thank you all in advance! Annette Waters Software Configuration Management main 408.559.6888 direct 408.626.1215 fax 408.371.9524 SAN Valley Systems, Inc 2105 S. Bascom Ave. # 390 Campbell, CA 95008
RE: File Locking and unlocking
Unlock: cvs admin -u modulename cvs admin -u filename -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]On Behalf Of Greg A. Woods Sent: Monday, July 10, 2000 12:59 PM To: [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: Re: File Locking and unlocking [ On Monday, July 10, 2000 at 14:30:57 (-), [EMAIL PROTECTED] wrote: ] Subject: File Locking and unlocking Problem: When a lock is issued for a file, all revisions of the file are lock. When I try to unlock it, I get the error message that multiple revisions are locked please specify one. I have found no docummentation that has a unlock command, only the admin "-l" command for locking. Is there a unlock command, and what is it? Since CVS is explicilty designed to do the exact opposite of file locking (`C' == Concurrent, in this case), you're on your own. -- Greg A. Woods +1 416 218-0098 VE3TCP [EMAIL PROTECTED] robohack!woods Planix, Inc. [EMAIL PROTECTED]; Secrets of the Weird [EMAIL PROTECTED]
Merging from branch to mainline
New to CVS -- Help! For a production bug fix: - After creating a branchtag via "cvs rtag -b -r prodtag branchtag module" then, modifying files/unit and system testing - How do I merge the modified files back into the mainline/trunk of the CVS source? Thanks in advance for your reply(ies). Paul Adams -Original Message- From: Larry Jones [mailto:[EMAIL PROTECTED]] Sent: Tuesday, June 20, 2000 10:59 AM To: Brian Collins Cc: [EMAIL PROTECTED]; [EMAIL PROTECTED] Subject: Re: Repeatedly merging from branch to trunk Brian Collins writes: So, back to the branch, add another line (Line 3), commit it and merge it back to the trunk as above. This gives conflicts, thus: Line 1 f1 Line 2 on the trunk === Line 2 on the branch Line 3 1.1.2.2 when all I expected was the automatic merging of "Line 3"! Since the context is different, CVS isn't sure that it's actually put the new line in the right place, so it calls it a conflict and makes you verify that it is correct. *You* know that "Line 2 on the trunk" and "Line 2 on the branch" are equivalent, but CVS doesn't. -Larry Jones Ever notice how tense grown-ups get when they're recreating? -- Calvin
RE: bumping the initial rev
Thanks for the answer, but I just learned that: 4.3 Assigning revisions By default, CVS will assign numeric revisions by leaving the first number the same and incrementing the second number. For example, 1.1, 1.2, 1.3, etc. When adding a new file, the second number will always be one and the first number will equal the highest first number of any file in that directory. For example, the current directory contains files whose highest numbered revisions are 1.7, 3.1, and 4.12, then an added file will be given the numeric revision 4.1. Normally there is no reason to care about the revision numbers--it is easier to treat them as internal numbers that CVS maintains, and tags provide a better way to distinguish between things like release 1 versus release 2 of your product (see section 4.4 Tags--Symbolic revisions). However, if you want to set the numeric revisions, the `-r' option to cvs commit can do that. The `-r' option implies the `-f' option, in the sense that it causes the files to be committed even if they are not modified. For example, to bring all your files up to revision 3.0 (including those that haven't changed), you might invoke: $ cvs commit -r 3.0 Note that the number you specify with `-r' must be larger than any existing revision number. That is, if revision 3.0 exists, you cannot `cvs commit -r 1.3'. If you want to maintain several releases in parallel, you need to use a branch (see section 5. Branching and merging). -Original Message- From: Tobias Weingartner [mailto:[EMAIL PROTECTED]] Sent: Tuesday, June 13, 2000 4:40 PM To: [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: Re: bumping the initial rev On Tuesday, June 13, Paul Adams wrote: How do I bump the initial rev of all src files under CVS control? Need to bump from 1.1 to 1.2. This has got to be on a FAQ somewhere. The answer is... Don't do that. Version/Revision control is not really done with the revisions of each file under CVS control. Use symbolic tags instead. --Toby.
cvs admin -l not locking latest revs
Hello:I'm new to CVS and am trying to accomplish the following: - tag the head/latest rev of every file in the repo - lock the tagged src while allowing developers to con't coding on the main line When using the command "cvs admin -l tagname," developers are still able to commit files. What is the best method/procedure for locking down src in the repo based upon a tag/label assigned? Thanks in advance, Paul D. Adams AR/CC Configuration Management
bumping the initial rev
How do I bump the initial rev of all src files under CVS control? Need to bump from 1.1 to 1.2. Thanks, Paul D. Adams
