RE: cvs update; merge

[Jimm Grimm]

Excellent!  I'm in business now!

> I suggest you reexamine your choice of tools.  CVS is not designed to
> handle binary files and really doesn't do it very well.

Actually, it does OK.  There's not much anyone could do in the way of
merging them.  As long as it doesn't modify them in any way, and saves all
the old versions, I'll be just fine.  If it compressed them, that would be a
bonus, but I'm OK either way.

> >     Is there any way to get CVS to ignore CRLF conversions, 
> > yet still do merges?
> 
> No.

        Yes there is - you just showed me how to do it.  It works great -
Thanks!

Jimm

> -----Original Message-----
> From: address@hidden [mailto:address@hidden
> 
> Jimm Grimm writes:
> > 
> >     I updated my cvswrappers file to look like:
> > *.* -k 'b'
> > * -k 'b'
> > *.txt -m MERGE
> > 
> > But this doesn't seem to do any good.  In cvs.pdf, it says 
> the -m option is
> > for non-binary files, so I guess I shouldn't expect this to work.
> 
> Although it doesn't say so in the manual, I'm pretty sure the wrappers
> file is scanned in order and the first matching line is used, so you
> need to put more specific patterns before more general patterns.  Try
> changing your cvswappers file to:
> 
>       *.txt
>       * -k 'b'
> 
> and see if that doesn't work better.  (Note that "-m MERGE" is the
> default, so you don't really have to specify it; and that "*" 
> will match
> any filename, including ones that match "*.*", so there's no need for
> "*.*".)
> 
> >     What do you suggest I do?  We make lots of binary files (test
> > vectors) with all sorts of extensions, and have both win32 and linux
> > platforms.  It is impossible to predict what extensions 
> will be binary or
> > what machines they will be on, but we sure don't want any 
> to get messed up
> > if they are mistaken for ASCII.  At the same time, we do 
> want to be able to
> > merge ASCII source code.
> 
> I suggest you reexamine your choice of tools.  CVS is not designed to
> handle binary files and really doesn't do it very well.
> 
> >     Is there any way to get CVS to ignore CRLF conversions, 
> yet still do
> > merges?
> 
> No.
> 
> -Larry Jones
> 
> You're just trying to get RID of me, aren't you? -- Calvin