[cvsnt] Re: How to prevent CVSNT from merging binary files?

[Ryan J Ollos]

----- Original Message -----

>>From: "Hartmut Honisch" <hartmut_honisch at web.de>
>>To: <cvsnt at cvsnt.org>
>>Sent: Thursday, December 18, 2003 12:15 PM
>>Subject: [cvsnt] How to prevent CVSNT from merging binary files?
>>
>>
>>    
>>
>>>I have a file in my repository that I've declared as 
>>>      
>>>
>>"binary" (-kb). When
>>    
>>
>>>that file changes in the repository, CVSNT merges the 
>>>      
>>>
>>changes into the
>>    
>>
>>>working copy of my local file, just as if it was a normal 
>>>      
>>>
>>text file. I've
>>    
>>
>>>always thought that -kb tells CVSNT _not_ to merge a file - 
>>>      
>>>
>>but apparently
>>    
>>
>>>it does it anyway.
>>>
>>>Is this the desired behaviour, and if so, how do I prevent 
>>>      
>>>
>>CVSNT from
>>    
>>
>>>merging repository changes into my modified working copy?
>>>
>>>I use 2.0.14 on Win2K SP4
>>>
>>>-Hartmut
>>>

The -kb option disables keyword expansion and line ending conversion, 
which is disireable for binary files in the archive.  It should have no 
effect on how your file gets updated.  I'm not sure the best way to flag 
a file to not be updated, for instance when you update the whole 
directory containing that file, but this seems like a useful thing to 
know if anyone else can provide the answer.

Ryan