You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cocoon.apache.org by Robin Green <gr...@hotmail.com> on 2000/09/17 03:05:44 UTC

Re: cvs commit: xml-cocoon/src/org/apache/cocoon/processor/xsp/library/java response.xsl

Sorry, I seem to have messed up the line terminators here. This is probably 
because I edit in both Windows and Linux.

Which should it be - LF or CRLF or CR? Or just, the same as it was before?


_________________________________________________________________________
Get Your Private, Free E-mail from MSN Hotmail at http://www.hotmail.com.

Share information about yourself, create your own public profile at 
http://profiles.msn.com.


Re: cvs commit: xml-cocoon/src/org/apache/cocoon/processor/xsp/library/java response.xsl

Posted by Stefano Mazzocchi <st...@apache.org>.
Paul Russell wrote:
> 
> On Sun, Sep 17, 2000 at 02:32:59AM +0200, Stefano Mazzocchi wrote:
> > > Which should it be - LF or CRLF or CR? Or just, the same as it was before?
> > ??? CVS should fix those automatically for text files, shouldn't it?
> 
> Sortof - Windows clients will convert CRLFs to new lines (assuming
> a unix cvs server), but UNIX clients won't, so if robin is editing
> in windows but then commiting through UNIX, he could run into
> trouble...

Ah, ok. Robin, please, be careful not to do this, then.

-- 
Stefano Mazzocchi      One must still have chaos in oneself to be
                          able to give birth to a dancing star.
<st...@apache.org>                             Friedrich Nietzsche
--------------------------------------------------------------------
 Missed us in Orlando? Make it up with ApacheCON Europe in London!
------------------------- http://ApacheCon.Com ---------------------



Re: cvs commit: xml-cocoon/src/org/apache/cocoon/processor/xsp/library/java response.xsl

Posted by Giacomo Pati <Gi...@pwr.ch>.
Paul Russell wrote:
> 
> On Sun, Sep 17, 2000 at 02:32:59AM +0200, Stefano Mazzocchi wrote:
> > > Which should it be - LF or CRLF or CR? Or just, the same as it was before?
> > ??? CVS should fix those automatically for text files, shouldn't it?
> 
> Sortof - Windows clients will convert CRLFs to new lines (assuming
> a unix cvs server), but UNIX clients won't, so if robin is editing
> in windows but then commiting through UNIX, he could run into
> trouble...

Sure we will! I had the exact same experience. Changing on Windows,
copying to Linux and commiting it will introduce CRLF problems in the
CVS. It happens in the C2 branch some weeks ago.

Giacomo

-- 
PWR GmbH, Organisation & Entwicklung      Tel:   +41 (0)1  856 2202
Giacomo Pati, CTO/CEO                     Fax:   +41 (0)1  856 2201
Hintereichenstrasse 7                     Mobil: +41 (0)78 759 7703
CH-8166 Niederweningen                    Mailto:Giacomo.Pati@pwr.ch
                                          Web:   http://www.pwr.ch

Re: cvs commit: xml-cocoon/src/org/apache/cocoon/processor/xsp/library/java response.xsl

Posted by Paul Russell <pa...@luminas.co.uk>.
On Sun, Sep 17, 2000 at 02:32:59AM +0200, Stefano Mazzocchi wrote:
> > Which should it be - LF or CRLF or CR? Or just, the same as it was before?
> ??? CVS should fix those automatically for text files, shouldn't it?

Sortof - Windows clients will convert CRLFs to new lines (assuming
a unix cvs server), but UNIX clients won't, so if robin is editing
in windows but then commiting through UNIX, he could run into
trouble...


Paul
-- 
Paul Russell                               <pa...@luminas.co.uk>
Technical Director,                   http://www.luminas.co.uk
Luminas Ltd.

Re: cvs commit: xml-cocoon/src/org/apache/cocoon/processor/xsp/library/java response.xsl

Posted by Stefano Mazzocchi <st...@apache.org>.
Robin Green wrote:
> 
> Sorry, I seem to have messed up the line terminators here. This is probably
> because I edit in both Windows and Linux.
> 
> Which should it be - LF or CRLF or CR? Or just, the same as it was before?

??? CVS should fix those automatically for text files, shouldn't it?

-- 
Stefano Mazzocchi      One must still have chaos in oneself to be
                          able to give birth to a dancing star.
<st...@apache.org>                             Friedrich Nietzsche
--------------------------------------------------------------------
 Missed us in Orlando? Make it up with ApacheCON Europe in London!
------------------------- http://ApacheCon.Com ---------------------