You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@incubator.apache.org by sebb <se...@gmail.com> on 2011/11/18 13:23:58 UTC
Re: svn commit: r1203478 - /incubator/public/trunk/build.xml
On 18 November 2011 03:44, <cr...@apache.org> wrote:
> Author: crossley
> Date: Fri Nov 18 03:44:37 2011
> New Revision: 1203478
>
> URL: http://svn.apache.org/viewvc?rev=1203478&view=rev
> Log:
> Remove the fixcrlf target (which was added in r463590 and r741205). I reckon that this is now not needed, as the files now have correct "svn:eol-style" property.
> When people 'svn add' any new files, then be sure about http://apache.org/dev/version-control.html#https-svn-config
Are you sure it's not needed?
It does not fix source files, but generated files, and Anakia/Velocity
sometimes does funny things with EOLs.
I think it might be better to keep the target, but not invoke it automatically.
Then if problems do occur - e.g. cannot commit generated files because
of inconsistent line endings - it's easy to fix them.
> Modified:
> incubator/public/trunk/build.xml
>
> Modified: incubator/public/trunk/build.xml
> URL: http://svn.apache.org/viewvc/incubator/public/trunk/build.xml?rev=1203478&r1=1203477&r2=1203478&view=diff
> ==============================================================================
> --- incubator/public/trunk/build.xml (original)
> +++ incubator/public/trunk/build.xml Fri Nov 18 03:44:37 2011
> @@ -91,15 +91,8 @@
> </fileset>
> </copy>
> <copy file="${docs.src}/podlings.xml" tofile="${docs.dest}/podlings.xml"/>
> - <antcall target="fix"></antcall>
> -
> </target>
>
> - <target name="fix">
> - <echo message="Fix line endings due to inconsistent svn:eol-style properties etc."/>
> - <fixcrlf srcdir="${docs.dest}" includes="**/*.html"/>
> - </target>
> -
> <!--
> Site map generation
> -->
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
> For additional commands, e-mail: cvs-help@incubator.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
For additional commands, e-mail: general-help@incubator.apache.org
Re: svn commit: r1203478 - /incubator/public/trunk/build.xml
Posted by Jukka Zitting <ju...@gmail.com>.
Hi,
On Fri, Nov 18, 2011 at 1:23 PM, sebb <se...@gmail.com> wrote:
> I think it might be better to keep the target, but not invoke it automatically.
The target should still be there and executed automatically at least on Windows.
See below for what happens with the latest site build on my Windows laptop.
BR,
Jukka Zitting
$ uname -a
CYGWIN_NT-6.0 OIVA 1.7.3(0.225/5/3) 2010-04-03 11:26 i686 Cygwin
$ svn update
Fetching external item into 'rat'
External at revision 679965.
At revision 1203648.
$ svn status
X rat
Performing status on external item at 'rat'
$ ./build.sh
Buildfile: build.xml
[...]
$ svn status
X rat
M site-publish/projects/index.html
M site-publish/index.html
Performing status on external item at 'rat'
$ svn diff
svn: File 'site-publish/projects/index.html' has inconsistent newlines
svn: Inconsistent line ending style
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
For additional commands, e-mail: general-help@incubator.apache.org