"svn: Inconsistent line ending style" when trying to update site-publish?

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

"svn: Inconsistent line ending style" when trying to update site-publish?

Gwyn
Hi,
  I've updated site-author/stylesheets/project.xml (to add Wicket to
the list of projects,) and run ant but I'm having problems when I try
& check-in the updated files in site-publish, in that I get the
following sort of errors:-
   svn: File 'd:\Wicket\Apache\incubator\site-publish\projects\ibatis.html'
has inconsistent newlines
   svn: Inconsistent line ending style

If I fix that file  manually, it'll go on to another, so not just a
one-off.  Is this a 'known issue' when trying to update from Windows -
I tried Cygwin but no apparent difference.

/Gwyn
--
Download Wicket 1.2.2 now! - http://wicketframework.org

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

RE: "svn: Inconsistent line ending style" when trying to update site-publish?

Noel J. Bergman
Read the last three paragraphs of the section
http://www.apache.org/dev/version-control.html#https-svn

We probably (I haven't looked) have files without the eol-style attribute,
and there are likely committers who have not configured svn as described.

        --- Noel



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: "svn: Inconsistent line ending style" when trying to update site-publish?

Gwyn
I did, but the ibatis.html file at least, appears to have that
property set, as does my SVN client!

/Gwyn

On 12/10/06, Noel J. Bergman <[hidden email]> wrote:

> Read the last three paragraphs of the section
> http://www.apache.org/dev/version-control.html#https-svn
>
> We probably (I haven't looked) have files without the eol-style attribute,
> and there are likely committers who have not configured svn as described.
>
>         --- Noel
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>


--
Download Wicket 1.2.2 now! - http://wicketframework.org

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: "svn: Inconsistent line ending style" when trying to update site-publish?

Niall Pemberton-2
On 10/12/06, Gwyn Evans <[hidden email]> wrote:
> I did, but the ibatis.html file at least, appears to have that
> property set, as does my SVN client!

Generated files cause this, same issue occurs with the Apache site:

   https://issues.apache.org/jira/browse/INFRA-881

Theres a solution on the above ticket which I guess would work for incubator.

Niall

> /Gwyn
>
> On 12/10/06, Noel J. Bergman <[hidden email]> wrote:
> > Read the last three paragraphs of the section
> > http://www.apache.org/dev/version-control.html#https-svn
> >
> > We probably (I haven't looked) have files without the eol-style attribute,
> > and there are likely committers who have not configured svn as described.
> >
> >         --- Noel

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: "svn: Inconsistent line ending style" when trying to update site-publish?

Gwyn
On 13/10/06, Niall Pemberton <[hidden email]> wrote:
> On 10/12/06, Gwyn Evans <[hidden email]> wrote:
> > I did, but the ibatis.html file at least, appears to have that
> > property set, as does my SVN client!
>
> Generated files cause this, same issue occurs with the Apache site:
>
>    https://issues.apache.org/jira/browse/INFRA-881
>
> Theres a solution on the above ticket which I guess would work for incubator.

Thanks, that was it.  I've added an optional ANT target of 'fix' to
run the fixcrlf task and put a note in the README.  Optional, as it
changes a 3 second build to a 33 second one!

/Gwyn

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]