Re: lineendings problem

Robin Becker <[email protected]>:
>
> Someone I think panoplos or I has a problem with checking in/out
> changes. Apparently he just did something to Defaults.py that resulted
> in
> 
>         Changes since 1.27: +246 -248 lines 
> 
> I see a bunch of ^M's in my editor so somehow it got checked in with
> different line endings. According to the CVS/Entries it's a text file so
> I guess the client CVS is doing something pretty wrong.

Or Dallas's client... Dallas: Did you check it in as a binary file or
something? All files should be stored with \n line endings in the
repository, unless they are checked in as binary... And line endings
should be automatically modified on check-out to your platform...

(Not sure how to fix this, really -- probably not too hard.)

> This isn't a problem really, but it will cause conflicts to occur
> more often and make tracking changes much more difficult.
> 
> I suspect panoplos must be using a Mac.

Could just as well be a PC... (Unless there are *no* \n's in the
file...) But probably not a unix machine :)

-- 
Magnus Lie Hetland        Practical Python          The Anygui Project
http://hetland.org        http://ppython.com        http://anygui.org


-------------------------------------------------------
This sf.net email is sponsored by: To learn the basics of securing 
your web site with SSL, click here to get a FREE TRIAL of a Thawte 
Server Certificate: http://www.gothawte.com/rd524.html