Re: [dev] SVN and lineends

2008-10-30 Thread Eike Rathke
Hi Heiner,

On Wednesday, 2008-10-29 19:14:07 +0100, Heiner Rechtien wrote:

  modifying a .cxx file on Windows, and committing it to SVN, followed by
  a  svn diff -r PREV file, shows me that *the complete* file changed
  with the commit. Doing a svn diff -r PREV -x --ignore-eol-style file
  shows me only the changes which I just did.
  
  This makes me wonder, because so far, with CVS, we did not have that
  problem. Even a Lf-only source when edited in MS-Dev did not change
  line ends, AFAIK. What does cause this change?
 
 We use a hacked CVS client inside the Hamburg environment. It kills any
 CR in a non binary file no matter what.

Sigh.. so that MS-Dev editor appears to be still broken in this regard.

  Shouldn't we set to svn:eol-style property to a reasonable value
  (native, probably) for all our source files, globally?
  
  Probably not, see my previous mail I sent just a minute ago.

Reading
http://svnbook.red-bean.com/nightly/de/svn.advanced.props.file-portability.html#svn.advanced.props.special.eol-style

| Note that Subversion will actually store the file in the repository
| using normalized LF EOL markers regardless of the operating system. This
| is basically transparent to the user, though.

the 'native' style may be a solution to this problem. I wish we could
tell SVN to do that always, not only with native style. I hope that
works also when committing a file on *ix that was checked out on
Windows. Still, the patch scenario mentioned in my previous mail
applies. May need some extra care to be taken when applying patches
received from Windows users on *ix platforms.

  Eike

-- 
 OOo/SO Calc core developer. Number formatter stricken i18n transpositionizer.
 SunSign   0x87F8D412 : 2F58 5236 DB02 F335 8304  7D6C 65C9 F9B5 87F8 D412
 OpenOffice.org Engineering at Sun: http://blogs.sun.com/GullFOSS
 Please don't send personal mail to the [EMAIL PROTECTED] account, which I use 
for
 mailing lists only and don't read from outside Sun. Use [EMAIL PROTECTED] 
Thanks.


pgpORV6qYgIVE.pgp
Description: PGP signature


Re: [dev] SVN and lineends

2008-10-30 Thread Rich

On 2008.10.30. 16:06, Eike Rathke wrote:

Hi Heiner,

On Wednesday, 2008-10-29 19:14:07 +0100, Heiner Rechtien wrote:


modifying a .cxx file on Windows, and committing it to SVN, followed by
a  svn diff -r PREV file, shows me that *the complete* file changed
with the commit. Doing a svn diff -r PREV -x --ignore-eol-style file
shows me only the changes which I just did.

This makes me wonder, because so far, with CVS, we did not have that
problem. Even a Lf-only source when edited in MS-Dev did not change
line ends, AFAIK. What does cause this change?

We use a hacked CVS client inside the Hamburg environment. It kills any
CR in a non binary file no matter what.


Sigh.. so that MS-Dev editor appears to be still broken in this regard.


Shouldn't we set to svn:eol-style property to a reasonable value
(native, probably) for all our source files, globally?

Probably not, see my previous mail I sent just a minute ago.


Reading
http://svnbook.red-bean.com/nightly/de/svn.advanced.props.file-portability.html#svn.advanced.props.special.eol-style

| Note that Subversion will actually store the file in the repository
| using normalized LF EOL markers regardless of the operating system. This
| is basically transparent to the user, though.

the 'native' style may be a solution to this problem. I wish we could
tell SVN to do that always, not only with native style. I hope that
works also when committing a file on *ix that was checked out on
Windows. Still, the patch scenario mentioned in my previous mail
applies. May need some extra care to be taken when applying patches
received from Windows users on *ix platforms.


one could set pre-commit hook to sed all crlf to lf, but that still 
wouldn't help any with cross-platform patches.



  Eike

--
 Rich

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [dev] SVN and lineends

2008-10-29 Thread Eike Rathke
Hi Frank,

On Tuesday, 2008-10-28 10:57:39 +0100, Frank Schönheit wrote:

 modifying a .cxx file on Windows, and committing it to SVN, followed by
 a  svn diff -r PREV file, shows me that *the complete* file changed
 with the commit. Doing a svn diff -r PREV -x --ignore-eol-style file
 shows me only the changes which I just did.

This makes me wonder, because so far, with CVS, we did not have that
problem. Even a Lf-only source when edited in MS-Dev did not change
line ends, AFAIK. What does cause this change?

 Conclusion: We have a problem with our line endings - we certainly do
 *not* want to have a thousands-line-change-set for every file we
 modify/commit on Windows, do we?
 
 Shouldn't we set to svn:eol-style property to a reasonable value
 (native, probably) for all our source files, globally?

Probably not, see my previous mail I sent just a minute ago.

  Eike

-- 
 OOo/SO Calc core developer. Number formatter stricken i18n transpositionizer.
 SunSign   0x87F8D412 : 2F58 5236 DB02 F335 8304  7D6C 65C9 F9B5 87F8 D412
 OpenOffice.org Engineering at Sun: http://blogs.sun.com/GullFOSS
 Please don't send personal mail to the [EMAIL PROTECTED] account, which I use 
for
 mailing lists only and don't read from outside Sun. Use [EMAIL PROTECTED] 
Thanks.


pgpGkoMU2OnGk.pgp
Description: PGP signature


Re: [dev] SVN and lineends

2008-10-29 Thread Jens-Heiner Rechtien
Hi,

Eike Rathke wrote:
 Hi Frank,
 
 On Tuesday, 2008-10-28 10:57:39 +0100, Frank Schönheit wrote:
 
 modifying a .cxx file on Windows, and committing it to SVN, followed by
 a  svn diff -r PREV file, shows me that *the complete* file changed
 with the commit. Doing a svn diff -r PREV -x --ignore-eol-style file
 shows me only the changes which I just did.
 
 This makes me wonder, because so far, with CVS, we did not have that
 problem. Even a Lf-only source when edited in MS-Dev did not change
 line ends, AFAIK. What does cause this change?

We use a hacked CVS client inside the Hamburg environment. It kills any
CR in a non binary file no matter what.

 
 Conclusion: We have a problem with our line endings - we certainly do
 *not* want to have a thousands-line-change-set for every file we
 modify/commit on Windows, do we?

 Shouldn't we set to svn:eol-style property to a reasonable value
 (native, probably) for all our source files, globally?
 
 Probably not, see my previous mail I sent just a minute ago.
 
   Eike
 


Heiner

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



[dev] SVN and lineends

2008-10-28 Thread Frank Schönheit - Sun Microsystems Germany
Hi,

modifying a .cxx file on Windows, and committing it to SVN, followed by
a  svn diff -r PREV file, shows me that *the complete* file changed
with the commit. Doing a svn diff -r PREV -x --ignore-eol-style file
shows me only the changes which I just did.

Conclusion: We have a problem with our line endings - we certainly do
*not* want to have a thousands-line-change-set for every file we
modify/commit on Windows, do we?

Shouldn't we set to svn:eol-style property to a reasonable value
(native, probably) for all our source files, globally?

Ciao
Frank

-- 
- Frank Schönheit, Software Engineer [EMAIL PROTECTED] -
- Sun Microsystems  http://www.sun.com/staroffice -
- OpenOffice.org Base   http://dba.openoffice.org -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [dev] SVN and lineends

2008-10-28 Thread Jens-Heiner Rechtien
Hi Frank,

Frank Schönheit - Sun Microsystems Germany wrote:
 Hi,
 
 modifying a .cxx file on Windows, and committing it to SVN, followed by
 a  svn diff -r PREV file, shows me that *the complete* file changed
 with the commit. Doing a svn diff -r PREV -x --ignore-eol-style file
 shows me only the changes which I just did.
 
 Conclusion: We have a problem with our line endings - we certainly do
 *not* want to have a thousands-line-change-set for every file we
 modify/commit on Windows, do we?
 
 Shouldn't we set to svn:eol-style property to a reasonable value
 (native, probably) for all our source files, globally?

Will also not really help in all cases. If you check out under Unix (or
cygwin) and commit on Windows you get the same problem, which is
probably a common scenario. Unfortunately not everyone uses an able
editor which detects the line-style and conserves it on Windows. I've
thought a while about setting eol-style native during the migration,
but the best practices recommended to not set a eol-style to prevent
garbling of not correctly flagged binaries (I'm sure we've got a few).
This doesn't prevent us to do it now, of course. We would need to
prepare a list of files types which we consider sources ...

Let me hear your thoughts. Should we go to svn:eol-style native? For
which file types? Or should we stay with Unix and require that people
use editors which preserve the line end conventions? Is that even
possible for the more popular editors (I use vim, so I wouldn't know).

Heiner



-- 
Jens-Heiner Rechtien
[EMAIL PROTECTED]

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [dev] SVN and lineends

2008-10-28 Thread Frank Schönheit - Sun Microsystems Germany
Hi Heiner,

 Let me hear your thoughts. Should we go to svn:eol-style native? For
 which file types? Or should we stay with Unix and require that people
 use editors which preserve the line end conventions? Is that even
 possible for the more popular editors (I use vim, so I wouldn't know).

This requirement can hardly be fulfilled, I assume. At least not without
alienating a lot of developers. For instance, there is (AFAIK) no such
option in Microsoft Visual Studio, and I would *hate* to switch between
two applications when debugging/editing a source file.

For the file types, I'd be happy with an initial list containing .cxx
.hxx .src .hrc .txt .mk .pmk .java .cpp .h.

Ciao
Frank


-- 
- Frank Schönheit, Software Engineer [EMAIL PROTECTED] -
- Sun Microsystems  http://www.sun.com/staroffice -
- OpenOffice.org Base   http://dba.openoffice.org -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [dev] SVN and lineends

2008-10-28 Thread Andrey Hristov

 Hi,
Frank Schönheit - Sun Microsystems Germany wrote:

Hi Heiner,


Let me hear your thoughts. Should we go to svn:eol-style native? For
which file types? Or should we stay with Unix and require that people
use editors which preserve the line end conventions? Is that even
possible for the more popular editors (I use vim, so I wouldn't know).


This requirement can hardly be fulfilled, I assume. At least not without
alienating a lot of developers. For instance, there is (AFAIK) no such
option in Microsoft Visual Studio, and I would *hate* to switch between
two applications when debugging/editing a source file.


I am using VS much but AFAIK it will preserve the line endings while 
editing a file. If your file uses Unix-EOL then everything will be 
Unix-EOL in that file. Problems might occur if you start copy code with 
Windows-EOL.



For the file types, I'd be happy with an initial list containing .cxx
.hxx .src .hrc .txt .mk .pmk .java .cpp .h.

Ciao
Frank



Best,
Andrey

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]