[PD-dev] [OT] cvs without merges

Hans-Christoph Steiner hans at eds.org
Thu Apr 24 06:35:15 CEST 2003

If you tell cvs to treat it like a binary, -kb I think, it will
prevent merges and keyword substitution.  cvs co CVSROOT/cvswrappers and
you can see the file types that I set up to prevent merges and keyword
substitution in files such as .pd, where merges would just break


On Wed, 23 Apr 2003, Frank Barknecht wrote:

> Hallo,
> sorry for the off-topic cvs question. I didn't find the answer in the
> (long) cvs man page: 
> Sometimes, or rather often, while doing a cvs update, cvs tries to
> merge two revisions together, but fails keeping the syntax correct.
> Did you find this as well? And how can I get rid of cvs doing that?
> Thank you.
> ciao
> -- 
>  Frank Barknecht                               _ ______footils.org__
> _______________________________________________
> PD-dev mailing list
> PD-dev at iem.kug.ac.at
> http://iem.kug.ac.at/cgi-bin/mailman/listinfo/pd-dev


More information about the Pd-dev mailing list