[
https://issues.apache.org/jira/browse/ZOOKEEPER-1966?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14064634#comment-14064634
]
Orion Hodson commented on ZOOKEEPER-1966:
-----------------------------------------
Yep, file location took a turn for the worse. I pulled the files here via
git-svn and the files show unstaged changes after checkout which looks like an
artefact of what we're hoping to fix.
[~fpj], I've attached zip file with offending files tweaked by dos2unix for a
second go.
If this fails, perhaps we should ping the Apache SVN folks as this shouldn't be
this hard.
> VS and line breaks
> ------------------
>
> Key: ZOOKEEPER-1966
> URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1966
> Project: ZooKeeper
> Issue Type: Bug
> Components: c client
> Affects Versions: 3.5.0
> Environment: Windows, Visual Studio 2013 Build
> Reporter: Orion Hodson
> Assignee: Orion Hodson
> Fix For: 3.5.0
>
> Attachments: ZOOKEEPER-1966.2.patch, vs2013.d2u.zip
>
>
> The patch attached to https://issues.apache.org/jira/browse/ZOOKEEPER-1953
> has caused problems for git users when committed from SVN.
> The attached patch simply changes the line endings of the offending files
> from CRLF to LF in the hope that when they are committed to SVN, the LF line
> endings end up as the canonical representation in the Apache ZooKeeper git
> repo.
> An interpretation of what's happened here is that svn has stored the CRLF
> line endings and these have been pushed into git by git-svn as described
> here: http://blog.subgit.com/line-endings-handling-in-svn-git-and-subgit/.
> Git clients are then confused as the text files have an unexpected
> representation in the repo.
> Experimentally VS is indifferent to line endings – ran dos2unix on the
> vcxproj and sln files and VS opened and closed the files without modifying
> them. This page seems to advertise the indifference to line endings and
> discusses selecting custom options:
> http://msdn.microsoft.com/en-us/library/dd409797.aspx.
--
This message was sent by Atlassian JIRA
(v6.2#6252)
