[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Adding files with Inconsistent EOL markers

From: Greg Rundlett <greg.rundlett_at_oasis-open.org>
Date: Wed, 7 May 2008 13:00:51 -0400

On Wednesday 07 May 2008 11:59:48 am richard hornsby wrote:
> Not sure if you've seen this or not, but this discussion of using the
> svn:eol-style property to try to help eliminate the problem it sounds like
> you're having may be useful:
>
> http://svnbook.red-bean.com/en/1.1/ch07s02.html (most of the way down the
> page)
>
> -rj
Thanks Richard,

I have seen that reference in the manual. Re-reading the manual, it says that
svn stores the files with 'normalized' LF line endings. This means that I
don't have to worry about those inconsistent files being propagated through
the server. When I add them in my working copy, subversion cleans them up.
Yay. Thanks subversion.

This also explains why svn status doesn't 'see' a difference between a file
added with inconsistent line endings and a file converted to some other line
ending style -- svn status doesn't look at line endings.

I don't know of a valid reason to have different style line-endings in one
file, so it seems awkward that svn add doesn't complete it's job when it
emits the warning.

> On Wed, May 7, 2008 at 11:31 AM, Greg Rundlett
> <greg.rundlett_at_oasis-open.org>
>
> wrote:
> > When adding sources from large popular open source projects to my local
> > repo,
> > (e.g. grundlett_at_spidey2:~/work/oasis/vendorsrc/knowledgetree$ svn add
> > 3.5.2a-Release) I end up with errors that alert me that a file just added
> > has
> > inconsistend end of line markers. This causes the side-effect that the
> > recursive add stops before completing. Would the 'quiet' option supress
> > these errors so that the recursive add completes through the project
> > tree?
> >
> > My workaround is to use status to find 'unknown' files and add them:
> > svn st ./3.5.2b-Release | egrep ^\\? | cut -d ' ' -f7 | xargs svn add
> >
> > In a similar vein, would there be a good way to detect inconsistent EOL
> > markers prior to adding?
> >
> > I have used dos2unix to correct the EOL markers in the files that
> > triggered
> > the warning, but this change isn't noticed by "svn status" because the
> > files
> > are binary equal. This means that I can't checkin the 'corrected' file.
> > So
> > I'm afraid that for project sources that I want to export, I'll still get
> > mixed EOL
> > --
> > Gregory S. Rundlett
> > Manager, Technology Services
> > OASIS www.oasis-open.org
> > +1 (978) 667-5115 x 205
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
> > For additional commands, e-mail: users-help_at_subversion.tigris.org

-- 
Gregory S. Rundlett
Manager, Technology Services
OASIS www.oasis-open.org
+1 (978) 667-5115 x 205
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-05-07 19:01:15 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.