[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13492058#comment-13492058 ] Hadoop QA commented on ZOOKEEPER-1574: -- +1 overall. Here are the results of testing the latest attachment http://issues.apache.org/jira/secure/attachment/12552387/ZOOKEEPER-1574.trunk.patch against trunk revision 1404288. +1 @author. The patch does not contain any @author tags. +1 tests included. The patch appears to include 17 new or modified tests. +1 javadoc. The javadoc tool did not generate any warning messages. +1 javac. The applied patch does not increase the total number of javac compiler warnings. +1 findbugs. The patch does not introduce any new Findbugs (version 1.3.9) warnings. +1 release audit. The applied patch does not increase the total number of release audit warnings. +1 core tests. The patch passed core unit tests. +1 contrib tests. The patch passed contrib unit tests. Test results: https://builds.apache.org/job/PreCommit-ZOOKEEPER-Build/1252//testReport/ Findbugs warnings: https://builds.apache.org/job/PreCommit-ZOOKEEPER-Build/1252//artifact/trunk/build/test/findbugs/newPatchFindbugsWarnings.html Console output: https://builds.apache.org/job/PreCommit-ZOOKEEPER-Build/1252//console This message is automatically generated. > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Bug >Reporter: Raja Aluri > Attachments: 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 is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13526593#comment-13526593 ] Raja Aluri commented on ZOOKEEPER-1574: --- Can somebody please take a look at this? > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Bug >Reporter: Raja Aluri > Attachments: 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 is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13527190#comment-13527190 ] Patrick Hunt commented on ZOOKEEPER-1574: - Sounds reasonable to me. One negative is that source control history will be a bit more difficult to navigate (blame), but not a huge issue. Have you tested this with both unix and windows and validated that everything (build/test/run) still works? > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Bug >Reporter: Raja Aluri >Assignee: Raja Aluri > Attachments: 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 is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13527191#comment-13527191 ] Patrick Hunt commented on ZOOKEEPER-1574: - the intent is to only fix on trunk, correct? > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Bug >Reporter: Raja Aluri >Assignee: Raja Aluri > Attachments: 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 is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13528103#comment-13528103 ] Raja Aluri commented on ZOOKEEPER-1574: --- Regarding the history if you are using git, blame -w should filter these changes and should still give you the correct author. I think we should fix all active branches, but I thought trunk is a good start. I can take a look and submit patches for other branches, that are active. But in the mean time this patch can go in as is into trunk. > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Bug >Reporter: Raja Aluri >Assignee: Raja Aluri > Attachments: 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 is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13528106#comment-13528106 ] Raja Aluri commented on ZOOKEEPER-1574: --- I compiled and ran tests on this on both windows and linux > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Bug >Reporter: Raja Aluri >Assignee: Raja Aluri > Attachments: 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 is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13528774#comment-13528774 ] Patrick Hunt commented on ZOOKEEPER-1574: - A couple other drawbacks: 2) this patch has the potential to cause existing patches created before this one is committed to not apply cleanly. on the bright side it's easy to resolve. not sure the impact though in terms of breadth. 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. > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Bug >Reporter: Raja Aluri >Assignee: Raja Aluri > Attachments: 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 is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[
https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13528785#comment-13528785
]
Nikita Vetoshkin commented on ZOOKEEPER-1574:
-
I think {{svn propset svn:eol-style native }} should do the trick.
> mismatched CR/LF endings in text files
> --
>
> Key: ZOOKEEPER-1574
> URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574
> Project: ZooKeeper
> Issue Type: Bug
>Reporter: Raja Aluri
>Assignee: Raja Aluri
> Attachments: 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 is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13529122#comment-13529122 ] Raja Aluri commented on ZOOKEEPER-1574: --- [~phunt], Regarding the existing patches, I am not quite sure how many of them will be touching these files. I have submitted similar changes to some of the other apache projects and there were no issues. [~nekto0n] commented about the svn property, but I am not very familiar with the details of that property. I can submit the same patch to the branch 3.4 also. Not a problem. I will attach it today. > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Bug >Reporter: Raja Aluri >Assignee: Raja Aluri > Attachments: 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 is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13529192#comment-13529192 ] Raja Aluri commented on ZOOKEEPER-1574: --- Submitted another patch for branch-3.4 > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Bug >Reporter: Raja Aluri >Assignee: Raja Aluri > Attachments: ZOOKEEPER-1574.branch-3.4.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 is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13529194#comment-13529194 ] Hadoop QA commented on ZOOKEEPER-1574: -- -1 overall. Here are the results of testing the latest attachment http://issues.apache.org/jira/secure/attachment/12560423/ZOOKEEPER-1574.branch-3.4.patch against trunk revision 1420028. -1 @author. The patch appears to contain 4 @author tags which the Zookeeper community has agreed to not allow in code contributions. +1 tests included. The patch appears to include 20 new or modified tests. -1 patch. The patch command could not apply the patch. Console output: https://builds.apache.org/job/PreCommit-ZOOKEEPER-Build/1291//console This message is automatically generated. > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Bug >Reporter: Raja Aluri >Assignee: Raja Aluri > Attachments: ZOOKEEPER-1574.branch-3.4.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 is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[
https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13529224#comment-13529224
]
Nikita Vetoshkin commented on ZOOKEEPER-1574:
-
Property {{svn:eol-style native}} makes checked out files to automagically have
platform line endings (e.g CR/LF on Windows).
One must issue {{svn propset -R svn:eol-style native *.java}} command and
commit.
Google also suggests this [page from
apache|http://www.apache.org/dev/svn-eol-style.txt].
> mismatched CR/LF endings in text files
> --
>
> Key: ZOOKEEPER-1574
> URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574
> Project: ZooKeeper
> Issue Type: Bug
>Reporter: Raja Aluri
>Assignee: Raja Aluri
> Attachments: ZOOKEEPER-1574.branch-3.4.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 is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[
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
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13955778#comment-13955778 ] Michi Mutsuzaki commented on ZOOKEEPER-1574: I'll upload the second patch after the first one gets checked in. > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Improvement >Affects Versions: 3.4.6, 3.5.0 >Reporter: Raja Aluri >Assignee: Raja Aluri >Priority: Minor > 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)
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13955793#comment-13955793 ] Hadoop QA commented on ZOOKEEPER-1574: -- +1 overall. Here are the results of testing the latest attachment http://issues.apache.org/jira/secure/attachment/12637923/ZOOKEEPER-1574.patch against trunk revision 1583083. +1 @author. The patch does not contain any @author tags. +1 tests included. The patch appears to include 34 new or modified tests. +1 javadoc. The javadoc tool did not generate any warning messages. +1 javac. The applied patch does not increase the total number of javac compiler warnings. +1 findbugs. The patch does not introduce any new Findbugs (version 1.3.9) warnings. +1 release audit. The applied patch does not increase the total number of release audit warnings. +1 core tests. The patch passed core unit tests. +1 contrib tests. The patch passed contrib unit tests. Test results: https://builds.apache.org/job/PreCommit-ZOOKEEPER-Build/2010//testReport/ Findbugs warnings: https://builds.apache.org/job/PreCommit-ZOOKEEPER-Build/2010//artifact/trunk/build/test/findbugs/newPatchFindbugsWarnings.html Console output: https://builds.apache.org/job/PreCommit-ZOOKEEPER-Build/2010//console This message is automatically generated. > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Improvement >Affects Versions: 3.4.6, 3.5.0 >Reporter: Raja Aluri >Assignee: Raja Aluri >Priority: Minor > 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)
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13959232#comment-13959232 ] Michi Mutsuzaki commented on ZOOKEEPER-1574: ping > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Improvement >Affects Versions: 3.4.6, 3.5.0 >Reporter: Raja Aluri >Assignee: Raja Aluri >Priority: Minor > 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)
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13959526#comment-13959526 ] Michi Mutsuzaki commented on ZOOKEEPER-1574: I'm checking this in. This patch only modifies newline characters, and was generated automatically by running svn propset. > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Improvement >Affects Versions: 3.4.6, 3.5.0 >Reporter: Raja Aluri >Assignee: Raja Aluri >Priority: Minor > 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)
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13964009#comment-13964009 ] Enis Soztutar commented on ZOOKEEPER-1574: -- Thanks [~michim] for committing this. It is very important to have a canonical eol style in the repo. Otherwise patch process becomes a PITA. Can you also change the eol for bin/zkEnv.cmd. > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Improvement >Affects Versions: 3.4.6, 3.5.0 >Reporter: Raja Aluri >Assignee: Raja Aluri >Priority: Minor > 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)
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13964930#comment-13964930 ] Michi Mutsuzaki commented on ZOOKEEPER-1574: Thank you for reminding me. I don't know how I missed zkEnv.cmd. > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Improvement >Affects Versions: 3.4.6, 3.5.0 >Reporter: Raja Aluri >Assignee: Raja Aluri >Priority: Minor > 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)
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13964934#comment-13964934 ] Michi Mutsuzaki commented on ZOOKEEPER-1574: trunk: http://svn.apache.org/viewvc?view=revision&revision=1586200 It's already fixed in branch-3.4. > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Improvement >Affects Versions: 3.4.6, 3.5.0 >Reporter: Raja Aluri >Assignee: Raja Aluri >Priority: Minor > 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)
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13533708#comment-13533708 ] Mahadev konar commented on ZOOKEEPER-1574: -- Nikita/Raja, So we can just do a prop set and commit then? I tried this: find * | grep "java$" | xargs svn propset -R svn:eol-style native and its only changing the properties. Is this all we need to do on 3.4 and trunk? This is definitely better than committing the diff. > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Bug >Reporter: Raja Aluri >Assignee: Raja Aluri > Attachments: ZOOKEEPER-1574.branch-3.4.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 is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[
https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13533873#comment-13533873
]
Nikita Vetoshkin commented on ZOOKEEPER-1574:
-
Yes, I think so. Here's [another
link|http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.advanced.props.special.eol-style]
with in-depth description on {{eol-style}} use cases.
> mismatched CR/LF endings in text files
> --
>
> Key: ZOOKEEPER-1574
> URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574
> Project: ZooKeeper
> Issue Type: Bug
>Reporter: Raja Aluri
>Assignee: Raja Aluri
> Attachments: ZOOKEEPER-1574.branch-3.4.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 is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (ZOOKEEPER-1574) mismatched CR/LF endings in text files
[ https://issues.apache.org/jira/browse/ZOOKEEPER-1574?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13534121#comment-13534121 ] Raja Aluri commented on ZOOKEEPER-1574: --- I am not sure, if setting a property now will fix the previous commits. I think you still have to make this commit. (Probably you will get the same patch when you run the propset command). Also you may want to run the above command for all text files. (like *.java, *.html, *.pl etc.,) > mismatched CR/LF endings in text files > -- > > Key: ZOOKEEPER-1574 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-1574 > Project: ZooKeeper > Issue Type: Bug >Reporter: Raja Aluri >Assignee: Raja Aluri > Attachments: ZOOKEEPER-1574.branch-3.4.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 is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
