Larry Jones wrote:
like i said, the file is a text file, it is just marked with -kb so cvs
will not modify line endings.
Ittay Dror writes:
well, i created a file named test.sh, marked it as -kb, made some changes
and commits and on the server side, test.sh,v appeared to have each commit
as the full file, not a diff.
Like I said, diff doesn't usually work very well on binary files.
yes, but why can't i just say: "don't modify line endings" without
meaning the file is binary?
and if my file is not binary (test.sh), but is marked as -kb, will CVS try
to merge it?
CVS has no way to know whether your file is "really" binary or not -- if
you tell CVS it's a binary file, then it will be treated as a binary
file and will not merge it.
oh, it is, because cvs decided to change the file without giving me a
reasonable way to tell it not to.
i don't. i want to prevent CVS from converting line endings. the file is
checked out in windows but is later used in linux (it is part of a product
build), but because CVS converts line endings, i get a '/bin/bash^M: bad
That's not CVS's fault. If you want to use the file on Linux, you
should check it out on Linux. If you can't do that for some reason,
then you need to transfer the file using something that converts the
line endings correctly.
Ittay Dror <address@hidden>