You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Fred Yankowski <fr...@ontosys.com> on 2004/12/10 17:03:17 UTC
"inconsistent newlines" error during import
I have set up my $HOME/.subversion/config like this
[miscellany]
enable-auto-props = yes
[auto-props]
* = svn:eol-style=native
according to the suggestion at
<http://dev.zope.org/Subversion/SubversionConfigurationForLineEndings>.
When I try to import the code from the WordPress project with that
config in effect I get a fatal error like this:
svn: File '/usr/local/src/wordpress/1.2.1/wp-comments-post.php'
has inconsistent newlines
If I temporarily disable auto-props then I'm able to do the import.
If I then re-enable auto-props and checkout the code, it's identical
to the original code (input to import).
Assuming a config as above, here's a test case that shows the problem:
echo -e "foo\r\r" > foo.txt
svn import foo.txt file:///var/tmp/svntest/junk
With subversion 1.1.1 this gives the "inconsistent newlines" error.
Note that foo.txt ends with two CRs (\r) and one NL (\n) -- a weird
line-ending for sure, but one that appears in some real-world source
files.
So, am I OK to just temporarily disable auto-props when I hit that
error during an import? Or is this just deferring some problem
that'll bite me later? I don't understand why the
svn:eol-style=native property affects import anyway, as it seems like
it should affect only how files are checked out, not how they are
stored in the repository.
--
Fred Yankowski fred@ontosys.com tel: +1.630.879.1312
OntoSys, Inc PGP keyID: 7B449345 fax: +1.630.879.1370
www.ontosys.com 38W242 Deerpath Rd, Batavia, IL 60510-9461, USA
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org