Re: CVS Stable Branch - New File Line End Issue

[Derek Robert Price]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Conrad T. Pino wrote:

>The following new files:
>
>    windows-NT/JmgStat.c
>    windows-NT/JmgStat.h
>
>have line end problems in Windows Visual C++ 6.0 (VC6)
>development environment.  The message displayed is:
>
>    Lines ending with only a carriage return have been
>    detected.  These will be modified to include a line
>    feed.
>
>The file then appears in the edit window and appears to
>be double spaced.
>
>I'd appreciate some feedback from the original committer
>as to what line end convention was used in the original
>file.


Whoops.  I checked in files with Windows EOLs (\r\n) from UNIX.  Since
UNIX is canonical for CVS, no EOL conversion was done.  Then on
checkout your client converted UNIX EOLs (\n) to Windows EOLs (\r\n),
yielding a bastard-cross-breed (\r\r\n):

    linecontent\r\n -> linecontent\r\r\n.

Your editor appears to have spotted the extra carriage returns (\r),
assumed they were desired, and converted them into Windows EOLs as
well (\r\n), yielding two Windows EOLs (\r\n\r\n) for each one that
originated on UNIX:

    linecontent\r\r\n -> linecontent\r\n\r\n

Thus, the double-spacing.

Anyhow, I recommitted the files with proper UNIX EOLs from this end.
That should fix things.

Cheers,

Derek

- --
                *8^)

Email: derek@ximbiot.com

Get CVS support at <http://ximbiot.com>!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFBP1QCLD1OTBfyMaQRAj4xAJ9xHqcIVkdYrQwRFEMZDeI20kkZfgCgkCxq
r4TEJaeqtBSxGtAvRNYf+Is=
=Fdzx
-----END PGP SIGNATURE-----