forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Crossley <cross...@apache.org>
Subject mixed line-endings and configure SVN clients (Was: svn commit: r239296 ...MANIFEST.MF)
Date Tue, 23 Aug 2005 03:51:29 GMT
I am going to use this example to help explain some
of the problems with line-endings.

Ross, svn log shows that you added the initial
MANIFEST.MF file.

It already had mixed line endings. (By the way,
that makes me wonder about the origin of the code.)

If Ross' svn client was configured to recognise
*.MF as a text type file, then it would have reported
trouble when he tried to do 'svn add'.

http://www.apache.org/dev/version-control.html#https-svn
has a .subversion/config file list of filename extensions.
It doesn't know about *.MF so i just added that.
Committers need to keep up-to-date with that list.

To fix the file, i did 'dos2unix MANIFEST.MF' to convert
all line-endings to *my* native format (UNIX). I presume
that committers using Windows would do the opposite.

Then i manually set the missing property with
'svn propset svn:eol-style native MANIFEST.MF'.

Anyway, this inconsistency caused trouble when applying
the patch from FOR-641. The 'patch' command failed,
probably because i had already converted the line-endings
in the patch file.

-David

> Author: crossley
> Date: Mon Aug 22 19:41:32 2005
> New Revision: 239296
> 
> URL: http://svn.apache.org/viewcvs?rev=239296&view=rev
> Log:
> This file had mixed line-endings.
> Also do 'svn propset svn:eol-style native'.
> 
> Modified:
>     forrest/trunk/tools/eclipse/plugins/org.apache.forrest/META-INF/MANIFEST.MF   (contents,
props changed)
> 
> Modified: forrest/trunk/tools/eclipse/plugins/org.apache.forrest/META-INF/MANIFEST.MF
> URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/eclipse/plugins/org.apache.forrest/META-INF/MANIFEST.MF?rev=239296&r1=239295&r2=239296&view=diff
> ==============================================================================
> --- forrest/trunk/tools/eclipse/plugins/org.apache.forrest/META-INF/MANIFEST.MF (original)
> +++ forrest/trunk/tools/eclipse/plugins/org.apache.forrest/META-INF/MANIFEST.MF Mon Aug
22 19:41:32 2005
> @@ -37,18 +37,18 @@
>   org.apache.log4j.spi,
>   org.apache.log4j.varia,
>   org.apache.log4j.xml
> -Require-Bundle: org.apache.ant,
> - org.eclipse.ant.core,
> - org.eclipse.ui,
> - org.eclipse.jdt.core,
> - org.eclipse.jdt.launching,
> - org.eclipse.jface.text,
> - org.eclipse.core.resources,
> - org.eclipse.core.runtime,
> - org.eclipse.debug.core,
> - org.eclipse.ui.ide,
> - org.eclipse.debug.ui,
> - org.apache.forrest.eclipse.servletEngine,
> - org.eclipse.ui.views,
> +Require-Bundle: org.apache.ant,
> + org.eclipse.ant.core,
> + org.eclipse.ui,
> + org.eclipse.jdt.core,
> + org.eclipse.jdt.launching,
> + org.eclipse.jface.text,
> + org.eclipse.core.resources,
> + org.eclipse.core.runtime,
> + org.eclipse.debug.core,
> + org.eclipse.ui.ide,
> + org.eclipse.debug.ui,
> + org.apache.forrest.eclipse.servletEngine,
> + org.eclipse.ui.views,
>   org.eclipse.wst.web.ui
>  Eclipse-AutoStart: true
> 
> Propchange: forrest/trunk/tools/eclipse/plugins/org.apache.forrest/META-INF/MANIFEST.MF
> ------------------------------------------------------------------------------
>     svn:eol-style = native
> 

Mime
View raw message