On 10/30/06, Giulio Troccoli <Giulio.Troccoli@uk.linedata.com> wrote:
> On AIX and Windows everything is fine, but on Solaris sometimes the build
> failed because the compiler does not like the EOL of some files. These
> happens (and strangely not always) when the files have been edited using
> Visual Studio.
>
> I read the Subversion documentation and I found the svn:eol-style property.
> I have set it to native on ALL source files, and that's when I started
> having the issue.
> Now, when I tried to commit some changes from Windows, the commit failed
> with
>
> Error Commit failed (details follow):
> Error File '*****' has inconsistent newlines
> Error Inconsistent line ending style
Either Visual Studio is saving files with a different EOL marker than
what's "native" on Windows, or the EOL markers haven't been converted
to Native yet on those files. I suspect the latter, but I don't recall
whether setting svn:eol-style will update your working copy if you
don't check out/update the file contents themselves (I hope that made
sense - IOW, you can set the property, but the client won't change the
line endings until the file contents change).
> In this cases I have to delete the svn:eol-style property on those files and
> commit again. This, however, means that I cannot be sure that the build on
> the Solaris platform will succeed because I cannot be sure that the EOL on
> those files will be correct for that platform.
> What can I do?
Set the property again on all the files, and check out a fresh WC (or,
for safety's sake, do this in a test repository so you don't
accidentally mangle your production one). Then edit a couple files
with Visual Studio and see if the same error occurs. This will
hopefully show you which side of what I wrote above is right.
If it still happens with a fresh checkout, I would start wondering if
Visual Studio is what's mixing your EOLs up. If that's the case, get
VS under control, as it's the culprit.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Oct 30 15:28:14 2006