[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 01:32:30 -0400 (EDT) |
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.
> 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.
> 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?!?
--
Larry Jones
I never get to do anything fun. -- Calvin
- line endings in text files and -kb, Ittay Dror, 2008/09/10
- Re: line endings in text files and -kb,
Larry Jones <=
- Re: line endings in text files and -kb, Ittay Dror, 2008/09/11
- Re: line endings in text files and -kb, Larry Jones, 2008/09/11
- Re: line endings in text files and -kb, Ittay Dror, 2008/09/11
- Re: line endings in text files and -kb, Todd Denniston, 2008/09/11
- Re: line endings in text files and -kb, Ittay Dror, 2008/09/11
- Re: line endings in text files and -kb, Paul Sander, 2008/09/11
- Re: line endings in text files and -kb, Ittay Dror, 2008/09/11
- Re: line endings in text files and -kb, Paul Sander, 2008/09/11
- Re: line endings in text files and -kb, Todd Denniston, 2008/09/11
- Re: line endings in text files and -kb, Ittay Dror, 2008/09/11