From: Alan W. I. <ir...@be...> - 2002-07-02 15:06:45
|
On Tue, 2 Jul 2002, Vince Darley wrote: > >>> > Note the informal rule on file line endings is Linux/Unix line endings > "nl" > everywhere in the tree except the windows specific part of the tree such > as > sys/win32/msdev/ where windows line endings "cr nl" should be used. > >>> > > I don't believe this really works like that at all. All 'cvs' clients I > know of on Windows will convert line-endings on the fly when you checkout > unless the file is marked as binary in cvs. This means all of the cvs > tree that I checkout uses 'cr nl'. When committing, cvs compares but > ignoring line-ending differences. Under Linux/Unix whatever line-ending style is in cvs is checked out that way and not converted and similarly on check-in. I wasn't sure what happened on windows, but I noticed in the past that some of the files in the windows area were a horrible mixture of the two styles so I made the decision to convert them to a consistent (windows) style. I notice on all your many recent check-ins that you are using a Linux line ending style. I really appreciate that for the core parts, but you don't need to extend that to sys/win-tk/ if it is an extra burden for you there. > > (note: this causes a problem because the perl script pltclgen assumes the > files it is looking at have '\n' lineendings and so fails to generate > anything useful. Also when I check out the two .fnt files they are > corrupted and cause plplot to abort when trying to use them -- no error > checking seems to be done! This seems to be because they are checked in as > ascii, which is not a good thing. They should use -kb so cvs treats them > as binary files and doesn't destroy them on checkout to mac/win). Ahhh, the joys of cross-platform development.... The obvious solution to these problems is to find a line ending switch on your cvs client so it doesn't mess with the files on check-out and check-in. However, I assume you have looked long and hard for such a switch, and there isn't one so we will have to find some other solution. Geoffrey, perl is supposed to work cross-platform so this line ending situation must have come up again and again. Is there an easy fix for this? Maurice, do you know how to make the administrative cvs changes to fix the font file checkout problems? I understand you are particularly time-pressed at the moment so just let me know what to do, and I will do it (and test the result to make sure it doesn't mess up the Linux/Unix side of things). Alan |