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

Re: Question about "commit" not committing everything

From: Lasse Vågsæther Karlsen <lasse_at_vkarlsen.no>
Date: 2007-06-11 19:42:52 CEST

On 6/11/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
> Lasse Vågsæther Karlsen wrote:
>
> > Ok, now I tried this and what happens now is that the program adds
> > some of the files and then stops with the following error message:
> >
> > Error File '....' has inconsistent newlines
> > Error Inconsistent line ending style
>
> Check the Subversion config file (TSVN->Settings->General->"Edit"
> Subversion configuration file).
> You have in the section [autoprops] the svn:eol-style property set for
> certain file types. And one of the files with such a file extension has
> inconsistent line endings (e.g., CRLF and LF lineendings mixed in the
> same file). You can either deactivate the svn:eol-style property or fix
> the inconsistent line endings.
>
> Stefan

Removing the setting "svn:eol-style=native" from all my extensions did
indeed fix the problem, however if I may, I still think there is a bug
here.

I verified this now using a laptop with disk snapshot software
installed, and if I do an "Add..." command, it will stop with the
error message, and another "Add..." command will happily add the file
that it stopped on beforehand. However, restoring from the snapshot
and doing a simple Commit command stops on exactly the same file,
however it does not report any errors, it just seems to pretend the
job is done.

Let me just recap what I'm seeing here:

1. With "svn:eol-style=native" present for my text files (which might
very well have inconsistent line endings, I don't really know)
2. Doing a Commit will only commit some of the files, and then stop,
saying "Complete At revision: x"
3. Doing an add on the exact same disk snapshot stops with an error
message about inconsistent line endings for the file the commit stops
on
4. Doing another add accepts the file without problem, but stops on
another further down

So... With that setting in place it seems that the Add command detects
that something is amiss, but happily accepts the file on another try
(Bug #1), while the Commit command happily adds as many files as it
can, and then commits those, never reporting that it stopped adding
before it had processed all the files (Bug #2).

Is this setting just quirky by design and I should just ignore it?
What will the effect of not having an eol-style setting for my files
be?

-- 
Lasse Vågsæther Karlsen
mailto:lasse@vkarlsen.no
Received on Mon Jun 11 19:43:05 2007

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