[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files

["Michi Mutsuzaki (JIRA)" <ji...@apache.org>]

    [ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13955748#comment-13955748 ] 

Michi Mutsuzaki commented on ZOOKEEPER-1574:
--------------------------------------------

Here is the list of files in trunk with CRLF:

{noformat}
% grep -Irl --color "^M"                                             
bin/zkEnv.cmd
bin/zkServer.cmd
bin/zkCli.cmd
bin/README.txt
src/c/c-doc.Doxyfile
src/contrib/zooinspector/zooInspector.cmd
src/contrib/zooinspector/build.xml
src/contrib/zooinspector/lib/log4j.properties
src/contrib/zooinspector/README.txt
src/contrib/zooinspector/ivy.xml
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/BasicDataEncryptionManager.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/encryption/DataEncryptionManager.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/Pair.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeManager.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/NodeListener.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManager.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/ZooInspector.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorPanel.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/NodeViewersChangeListener.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersPanel.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/about.html
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorAboutDialog.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorTreeViewer.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerData.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/ZooInspectorNodeViewer.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerACL.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorNodeViewersDialog.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/gui/ZooInspectorConnectionPropertiesDialog.java
src/contrib/zooinspector/src/java/org/apache/zookeeper/retry/ZooKeeperRetry.java
src/contrib/loggraph/web/org/apache/zookeeper/graph/resources/date.format.js
src/java/test/org/apache/zookeeper/test/SessionInvalidationTest.java
src/java/test/org/apache/zookeeper/test/FLEPredicateTest.java
src/java/test/org/apache/zookeeper/test/ReconfigTest.java
src/java/test/org/apache/zookeeper/server/PrepRequestProcessorTest.java
src/java/main/org/apache/zookeeper/server/SnapshotFormatter.java
{noformat}

Setting svn:eol-style property does modify the files in place. I'll upload two separate patches, one for these files that contain CRLF, and the other for the files without CRLF. The latter should only contain property changes without any code changes. Regarding some of Pat's comments:


{quote}
2) this patch has the potential to cause existing patches created before this one is committed to not apply cleanly. Similar problems in backporting changes from trunk to branch 3.4 unless we also make similar changes on that branch. On the bright side it's easy to resolve. Not sure the impact though in terms of breadth.
{quote}

Given the list of files with CRLF are from zooinspector, the change shouldn't affect too many patches.

{quote}
3) keep in mind that the core repo is SVN, and not GIT. While git is available it's read only. All commits go through SVN. Is there a way to fix (similar to git attributed) this in SVN as well? Otherwise these same issues will keep cropping up.
{quote}

Subversion 1.8 added repository dictated configuration to solve this problem, but it seems unreasonable to expect everybody to use subversion 1.8. We might want to consider migrating to git at some point, maybe after 3.5.0 is released.

> mismatched CR/LF endings in text files
> --------------------------------------
>
>                 Key: ZOOKEEPER-1574
>                 URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574
>             Project: ZooKeeper
>          Issue Type: Bug
>    Affects Versions: 3.4.6, 3.5.0
>            Reporter: Raja Aluri
>            Assignee: Raja Aluri
>             Fix For: 3.4.7, 3.5.0
>
>         Attachments: ZOOKEEPER-1574.branch-3.4.patch, ZOOKEEPER-1574.patch, ZOOKEEPER-1574.trunk.patch
>
>
> Source code in zookeeper repo has a bunch of files that have CRLF endings.
> With more development happening on windows there is a higher chance of more CRLF files getting into the source tree.
> I would like to avoid that by creating .gitattributes file which prevents sources from having CRLF entries in text files.
> But before adding the .gitattributes file we need to normalize the existing tree, so that people when they sync after .giattributes change wont end up with a bunch of modified files in their workspace.
> I am adding a couple of links here to give more primer on what exactly is the issue and how we are trying to fix it.
> [http://git-scm.com/docs/gitattributes#_checking_out_and_checking_in]
> [http://stackoverflow.com/questions/170961/whats-the-best-crlf-handling-strategy-with-git]
> I will submit a separate bug and patch for .gitattributes



--
This message was sent by Atlassian JIRA
(v6.2#6252)