Re: line endings in text files and -kb

[Ittay Dror]

Larry Jones-4 wrote:
> 
> Ittay Dror writes:
>> 
>> If I use 'cvs admin -kb some_file.txt', does this mean that CVS stops
>> storing diff of each commit and instead stores the whole file in each
>> commit?
> 
> No, CVS always stores diffs, but diff usually doesn't work very well on
> binary files.
>  
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. 


> 
>> What happens in merge? Does it mean that CVS does no automatic merge
>> for such a file?
> 
> CVS doesn't do *any* merging on binary files.  It simply reports that an
> unmergeable file needs merging and leaves it up to you to merge however
> you can.
> 
and if my file is not binary (test.sh), but is marked as -kb, will CVS try
to merge it? 


> 
>> Note that the file is text, so that 'diff' (*nix diff, not
>> 'cvs diff') will work on it.
> 
> If it's a text file, why do you want to mark it as binary?!?
> 
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'

Ittay



> -- 
> Larry Jones
> 
> I never get to do anything fun. -- Calvin
> 
> 
> 
> 

-- 
View this message in context: 
http://www.nabble.com/line-endings-in-text-files-and--kb-tp19411592p19428217.html
Sent from the Gnu - Cvs - Info mailing list archive at Nabble.com.