Excellent idea.  We'll give this a shot.  Thanks.

Sheldon Samuels
Panja 
V:  800-952-6995/972-644-3048
F:  972-644-1291
e-mail:  [EMAIL PROTECTED]

"Enjoy Change!
Savor the Adventure and 
the Taste of the New Cheese!"

from "Who Moved the Cheese" 
by Spencer Johnson

>>> <[EMAIL PROTECTED]> 07/25/00 02:01PM >>>


The Cederqvist manual has a list of all CVS keywords.  Search for these in your
code and remove any that you find, then you won't have to worry about them.
They all begin and end with a "$" character, such as "$ID$".  I find that using
the keywords is more trouble than it is worth, and is especially a pain in the
neck if you want to have branches in CVS which you merge back to the trunk.  We
have now gotten rid of all of our keywords in our source code, and haven't
missed them once ever since.

Keywords are most useful if you have a less-capable CM system (such as
SCCS/RCS/etc).  With the power and ease of CVS, the usefullness of keywords
begins to evaporate.

Alan Thompson









"Sheldon Samuels" <[EMAIL PROTECTED]> on 07/25/2000 10:09:49 AM
                                                                                
                                                                                
                                                                                


                                                              
                                                              
                                                              
 To:      [EMAIL PROTECTED]                                    
                                                              
 cc:      (bcc: Alan Thompson/Orincon)                        
                                                              
                                                              
                                                              
 Subject: Re: merging of binary files                         
                                                              




I have a related question.  We have source files C++ and others, that are plain
text, but chose to save as Binary to insure that CVS doesn't do keyword
substitution on our files in inappropriate places.  Since the code was
pre-existing when we went to Open Source, we were concerned that there may be
keywords in the code that were not intended to be keywords.  So all files were
added as binary just to be safe.  Were we being too cautious?  Will CVS attempt
to merge these files, since they are text, or will it assume they are unreadable
binary files.  I have successfully been able to do a diff between different
versions of a file in some testing that I did.

We are just now coming up to speed on CVS.  We are using WinCVS, in case that
matters.

Thanks in advance.

Sheldon Samuels
Panja
V:  800-952-6995/972-644-3048
F:  972-644-1291
e-mail:  [EMAIL PROTECTED] 

"Enjoy Change!
Savor the Adventure and
the Taste of the New Cheese!"

from "Who Moved the Cheese"
by Spencer Johnson






Reply via email to