[
https://issues.apache.org/jira/browse/IVY-470?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12488099
]
Xavier Hanin commented on IVY-470:
----------------------------------
Yes, I also noticed things like that, in the diff sent to the commit mailing
list for instance. What I'm still wondering about is if xooki doesn't already
use always the same end of line, but since some pages were never modified using
xooki before, they still have another eol. This is only a guess however, since
I've never investigated. What could be done quite easily if it's not easy to
make sure that xooki always use the same eol char, would be to use ant fixcrlf
task on the doc before commiting. OTOH I don't know how svn:eol-style
properties can be used, so maybe there is a good solution with it too. But I
think that it would really be better to avoid changing eol when we edit pages
using xooki, so maybe the svn solution won't really help for that, I don't know.
> EOL in the doc pages
> --------------------
>
> Key: IVY-470
> URL: https://issues.apache.org/jira/browse/IVY-470
> Project: Ivy
> Issue Type: Wish
> Components: Documentation
> Affects Versions: 2.0
> Environment: OS : Windows
> Subversion client : windows
> Browser : Firefox on Windows
> Command line : cygwin (but with the windows svn)
> Reporter: Gilles Scokart
>
> When playing with patches and svn update, I notice a small issue with the doc
> files. It seems that we have some 'changing end of line' characters into the
> part editable by xooki. I guess it is according to the OS where we edit the
> file.
> For a concrete example:
> I modified locally (on Windows) a file in the browser directly. I made an
> svn update that was conflicting. In theory I didn't modified the same lines
> than the one modified in the repository. So the merge should have been done
> automatically. However, svn was considering that all the textarea content
> was conflicting.
> I'm not sure where the fix should be done: either in xooki to always save
> using the same end of line character (I don't if it is feasible) or in the
> svn properties 'svn:eol-style' of the files.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
