Hi, I have the following problem :
- my module contains some text files (code, let's say *.c) and some binary files (images, let's say *.gif). The cvswrappers file I have automatically recognizes the binary files extension and uses the '-kb' keyword substitution mode for them. All the code files contain a keyword (let's say $Id$). - in the repository there's the main trunk and also a branch. When I want to merge all the modifications made on the branch into the main trunk I do : cvs up -j branch-tag The problem is that each code file has at least a difference due to the keyword substitution (different revision numbers). The way to handle this seems to be : cvs up -kk -j branch-tag This avoids the differences due to the keyword substitution (different revision number), but the '-kk' option is sticky and applies to all the files, even the *.gif ones. What I don't understand is if the '-kk' has (or may have) somehow altered the binary files coming from the repository (where they were correctly stored). Formulated in a different way, is the following ok : 1) cvs up -kk -j branch-tag : the working copy files are updated and have a sticky -kk option, but the binary files have not been modified. 2) cvs ci -m "Merge of main truck and branch" 3) cvs up -A to remove all the sticky '-kk' options Thanks for your help, ALCATEL SPACE INDUSTRIES Massimiliano MAINI D�partement Recherche "Techniques et Syst�mes Spatiaux" Groupe "Plateformes et Satellites" -- DRT / RPS Tel : +33 (0)4 92.28.97.26 / Fax : +33 (0)4 92.92.69.70 Porte : Y01-208 / E-Mail : [EMAIL PROTECTED] _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
