RE: cvs update; merge

[Greg A. Woods]

[ On Wednesday, August 29, 2001 at 13:42:31 (-0400), Jimm Grimm wrote: ]
> Subject: RE: cvs update; merge
>
>       Is there any way to get CVS to ignore CRLF conversions, yet still do
> merges?  I hope I am not touching a sore spot...

The whole idea of putting non-mergable (binary) files in CVS touches on
a very sore spot.

You cannot use branches well in the "normal" ways if you have lots of
binary files, for example.

CVS is meant for source code that can be compared with 'diff' and merged
with 'diff3' (since those are the only tools it used internally to
calculate deltas between revisions).  Use it with binary stuff at your
own risk.

-- 
                                                        Greg A. Woods

+1 416 218-0098      VE3TCP      <address@hidden>     <address@hidden>
Planix, Inc. <address@hidden>;   Secrets of the Weird <address@hidden>