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

[Martin Cole]

I added the line to my cvswrappers file

*.gif -m 'COPY'

that would make copies of any gif files that are updated from the
repository.

best to do this by checking out CVSROOT and editing the .cvswrappers file
and then committing it back.


Marts


ps.
could the line be made

*.gif -k 'b' -m 'COPY'                     ???

Regards
again

Marts

----- Original Message ----- 
From: "Hartmut Honisch" <hartmut_honisch at web.de>
To: <cvsnt at cvsnt.org>
Sent: Friday, January 02, 2004 11:37 AM
Subject: RE: [cvsnt] Re: How to prevent CVSNT from merging binary files?


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