I have a related question. We have source files C++ and others, that are plain text,
but chose to save as Binary to insure that CVS doesn't do keyword substitution on our
files in inappropriate places. Since the code was pre-existing when we went to Open
Source, we were concerned that there may be keywords in the code that were not
intended to be keywords. So all files were added as binary just to be safe. Were we
being too cautious? Will CVS attempt to merge these files, since they are text, or
will it assume they are unreadable binary files. I have successfully been able to do
a diff between different versions of a file in some testing that I did.
We are just now coming up to speed on CVS. We are using WinCVS, in case that matters.
Thanks in advance.
Sheldon Samuels
Panja
V: 800-952-6995/972-644-3048
F: 972-644-1291
e-mail: [EMAIL PROTECTED]
"Enjoy Change!
Savor the Adventure and
the Taste of the New Cheese!"
from "Who Moved the Cheese"
by Spencer Johnson
>>> <[EMAIL PROTECTED]> 07/25/00 11:59AM >>>
"binary" simply means that it is not a plain-text-based file separated by
newline characters. "Merging", as performed by CVS, diff, etc. is performed on
a line-by-line basis; so.....if you file doesn't have "lines", you need a tool
which understands your particular file format and knows how to perform a
sensible "merge". For some files like executables or JPEG images, there is no
sensible way to perform a "merge". However, an M$ Word file appears "binary"
since is is not stored as plain-text, even though it contains text information.
Because M$ Word uses a special format to store the text information, you need a
tool (such as built into Word) which understands that particular format before
the "binary" M$ Word text file can be merged with another.
Alan Thompson
Vandana <[EMAIL PROTECTED]> on 07/25/2000 05:41:23 AM
To: cvs-info <[EMAIL PROTECTED]>
cc: (bcc: Alan Thompson/Orincon)
Subject: merging of binary files
Hi,
I have to merge binary files. What are the problems encountered and how
do I go about it?
thanx in advance
Vandana
