[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: line endings in text files and -kb

From: Larry Jones
Subject: Re: line endings in text files and -kb
Date: Thu, 11 Sep 2008 11:19:24 -0400 (EDT)

Ittay Dror writes:
> well, i created a file named, marked it as -kb, made some changes
> and commits and on the server side,,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.

> and if my file is not binary (, 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.

> 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
> interpreter error'

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

That's the problem with nature.  Something's always stinging you
or oozing mucus on you. -- Calvin

reply via email to

[Prev in Thread] Current Thread [Next in Thread]