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

[Martin Cole]

I checked out the cvsroot from the repository in question and edited the
cvswrappers file

eg.

I added


# Wrappers for labview binary files
*.vi -m 'COPY'
*.llb -m 'COPY'
*.llx -m 'COPY'
*.mnu -m 'COPY'
*.ctl -m 'COPY'
*.vit -m 'COPY'
*.rtm -m 'COPY'


for labview files and then committed my changes, and it works correctly now.

Marts



----- 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
>
> _______________________________________________
> cvsnt mailing list
> cvsnt at cvsnt.org
> http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt
>