dos newline characters

6 views
Skip to first unread message

Felix Schwarz

unread,
Feb 24, 2008, 7:54:57 AM2/24/08
to authori...@googlegroups.com
Hi Kevin,

I noticed that you committed a lot of files which contain windows line
endings which look quite ugly when using a Un*x-based system. Can you set
some svn properties so that svn will convert these automatically, please?

Maybe this page will help you doing it:
http://www.zope.org/DevHome/Subversion/SubversionConfigurationForLineEndings

--
Felix Schwarz
Dipl.-Informatiker

Gubener Str. 38
10243 Berlin
Germany

www.schwarz.eu - software development and consulting


Kevin Horn

unread,
Feb 24, 2008, 1:34:07 PM2/24/08
to authori...@googlegroups.com


On Sun, Feb 24, 2008 at 6:54 AM, Felix Schwarz <felix....@oss.schwarz.eu> wrote:

Hi Kevin,

I noticed that you committed a lot of files which contain windows line
endings which look quite ugly when using a Un*x-based system. Can you set
some svn properties so that svn will convert these automatically, please?

Maybe this page will help you doing it:
http://www.zope.org/DevHome/Subversion/SubversionConfigurationForLineEndings

--
Felix Schwarz
Dipl.-Informatiker


Felix,

Hmmm, I thought I had already fixed this...

Which files (or file types) are you seeing this on?  TortoiseSVN _should_ be doing this right from what I can tell...I have
enable-auto-props = yes

and a bunch of

*.py = svn:eol-style=native

type lines in my config file

what else should I be doing?

Kevin Horn

Felix Schwarz

unread,
Feb 24, 2008, 4:59:24 PM2/24/08
to authori...@googlegroups.com
Kevin Horn schrieb:

> Hmmm, I thought I had already fixed this...
>
> Which files (or file types) are you seeing this on? TortoiseSVN
> _should_ be doing this right from what I can tell...I have
> enable-auto-props = yes
>
> and a bunch of
>
> *.py = svn:eol-style=native
>
> type lines in my config file
>
> what else should I be doing?

Apparently, it got better but there are quite a few leftovers.

A small test script:
--------------------------------------------------------------------------
#!/usr/bin/env python

import re
import sys

for item in sys.argv[1:]:
filename = item.strip()
contents = file(filename, "rb").read()
match = re.search("\r", contents)
if match != None:
print filename
--------------------------------------------------------------------------
detected the following
$ find authorize/ -type f | grep -v .svn | xargs python \
find_dos_line_endings.py
testapp/authoritytestapp/authoritytestapp/i18n/authoritytestapp.pot
testapp/authoritytestapp/authoritytestapp/templates/index.html
testapp/authoritytestapp/authoritytestapp/templates/private.html
testapp/authoritytestapp/authoritytestapp/public/images/under_the_hood_blue.png
testapp/authoritytestapp/authoritytestapp/public/images/header_inner.png
testapp/authoritytestapp/authoritytestapp/public/images/info.png
testapp/authoritytestapp/authoritytestapp/public/images/ok.png
testapp/authoritytestapp/authoritytestapp/public/images/tg_under_the_hood.png
testapp/authoritytestapp/authoritytestapp.egg-info/PKG-INFO
testapp/authoritytestapp/development.ini
setup.py
authority/schemes.py
authority/test/test_basic_auth.py
authority/test/testMiddleware.py
authority/methods.py
doc/sample-authority.ini
doc/_notes.txt
authority/middleware.py

--
Mit freundlichen Grüßen
Felix Schwarz
Dipl.-Informatiker

Gubener Str. 38
10243 Berlin
Germany

www.schwarz.eu - Software-Entwicklung und Beratung

percious

unread,
Feb 25, 2008, 11:54:43 PM2/25/08
to Authority
Kevin,

I think the problem is with your editor because all the changes you
commit have ^M in them. So, you might want to look into modifying
your editor's settings to use the unix newline instead of the windows
ones. I fixed all of the offending files and checked in version 21.

-chris

On Feb 24, 2:59 pm, Felix Schwarz <felix.schw...@oss.schwarz.eu>
wrote:

Kevin Horn

unread,
Feb 26, 2008, 12:18:11 AM2/26/08
to authori...@googlegroups.com
OK, that should be fixed now (er, again).  Don't be bashful if it happens again.

Kevin Horn
Reply all
Reply to author
Forward
0 new messages