Re: [lazarus] Line end characters in Lazarus

[Vincent Snijders]

Graeme Geldenhuys wrote:

Hi,

I am working on a cross platform application between Windows and
Linux, and source code lives in a Subversion repository (on a Linux
server).

Subversion now gave me a conflict, and has highlighted the whole file
(every line) has chanced.  I think this is due to the line end
characters of Windows and Linux being different. (CrLf vs Lf)

I am sure I saw an option somewhere in Lazarus, to say what line end
characters to use, but I can't seem to find it now.  Can anybody point
me in the right direction.



I think this should be handled by the svn client.
Make sure you have the set the line ending svn property of each file to native.

Vincent.

_
To unsubscribe: mail [EMAIL PROTECTED] with
   unsubscribe as the Subject
  archives at http://www.lazarus.freepascal.org/mailarchives

Re: [lazarus] Line end characters in Lazarus

[Graeme Geldenhuys]

 I think this should be handled by the svn client.
 Make sure you have the set the line ending svn property of each file to 
 native.

Any idea how I do this?

So what does Lazarus do with the line end characters when I edit a
file in Lazarus under Linux, that a collegue last edited in Lazarus
under Windows?
Does Lazarus preserve the line end characters used the first time the
file was edited, or does it keep changing them to whatever the last
platform used uses?

Regards,
  - Graeme -

_
 To unsubscribe: mail [EMAIL PROTECTED] with
unsubscribe as the Subject
   archives at http://www.lazarus.freepascal.org/mailarchives

Re: [lazarus] Line end characters in Lazarus

[Vincent Snijders]

Graeme Geldenhuys wrote:

I think this should be handled by the svn client.
Make sure you have the set the line ending svn property of each file to native.



Any idea how I do this?


If you use TortoiseSVN, right click on the file, Properties - Subversion.
Set svn:eol-style to native.

See also 
http://www.freepascal.org/wiki/index.php/SVN_Migration#Updating_and_commiting on how 
to add this automatically.




So what does Lazarus do with the line end characters when I edit a
file in Lazarus under Linux, that a collegue last edited in Lazarus
under Windows?
Does Lazarus preserve the line end characters used the first time the
file was edited, or does it keep changing them to whatever the last
platform used uses?


Lazarus saves file using native line ending.

Vincent.

_
To unsubscribe: mail [EMAIL PROTECTED] with
   unsubscribe as the Subject
  archives at http://www.lazarus.freepascal.org/mailarchives

Re: [lazarus] Line end characters in Lazarus

[Mattias Gaertner]

On Tue, 14 Mar 2006 11:13:05 +0200
Graeme Geldenhuys [EMAIL PROTECTED] wrote:

  I think this should be handled by the svn client.
  Make sure you have the set the line ending svn property of each file to
  native.
 
 Any idea how I do this?
 
 So what does Lazarus do with the line end characters when I edit a
 file in Lazarus under Linux, that a collegue last edited in Lazarus
 under Windows?
 Does Lazarus preserve the line end characters used the first time the
 file was edited, or does it keep changing them to whatever the last
 platform used uses?

Lazarus converts them to the line endings of the system (TSynEdit does not
preserve line endings).
svn converts the line endings on the fly. So if every text file has svn
property native line endings, you don't need to worry about it.


Mattias

_
 To unsubscribe: mail [EMAIL PROTECTED] with
unsubscribe as the Subject
   archives at http://www.lazarus.freepascal.org/mailarchives

Re: [lazarus] Line end characters in Lazarus

[Graeme Geldenhuys]

 See also
 http://www.freepascal.org/wiki/index.php/SVN_Migration#Updating_and_commiting 
 on how
 to add this automatically.

I use the svn command line client, but the above link explains everything.
Thanks!

Regards,
  - Graeme -

_
 To unsubscribe: mail [EMAIL PROTECTED] with
unsubscribe as the Subject
   archives at http://www.lazarus.freepascal.org/mailarchives