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

Hartmut Honisch hartmut_honisch at web.de
Fri Jan 2 16:37:00 GMT 2004


Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


> 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.

The current release of CVSNT fixes this behaviour: -kb both disables keyword
expansion and prevents CVSNT from merging changes into your modified sandbox
files. If CVSNT needs to update a binary file that has been modified, it
renames the local copy to ".#foo.revision" and gives you a clean copy
(instead of trying to merge the repository changes into the local file).

-Hartmut




More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook