[
https://issues.apache.org/jira/browse/ZOOKEEPER-2557?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15471618#comment-15471618
]
Chris Nauroth commented on ZOOKEEPER-2557:
------------------------------------------
[~eribeiro], I was not able to apply ZOOKEEPER-2557-3.5.patch on branch-3.5.
However, ZOOKEEPER-2557.2.patch did apply cleanly. Does it make sense to
proceed with this, or did you want something specific for branch-3.5?
For the difference on branch-3.4, I noticed that ".idea/" is missing there.
Would you please add that?
Actually, for ease of maintenance, I think the ideal situation is to make
.gitignore identical across trunk, branch-3.5 and branch-3.4, containing the
full superset of all these entries. That way, future patches won't run into
merge conflicts. Let me know your thoughts on this.
> Update gitignore to account for other file extensions
> -----------------------------------------------------
>
> Key: ZOOKEEPER-2557
> URL: https://issues.apache.org/jira/browse/ZOOKEEPER-2557
> Project: ZooKeeper
> Issue Type: Improvement
> Affects Versions: 3.4.8
> Reporter: Edward Ribeiro
> Assignee: Edward Ribeiro
> Priority: Trivial
> Labels: easyfix
> Fix For: 3.4.10, 3.5.3, 3.6.0
>
> Attachments: ZOOKEEPER-2557-3.4.patch, ZOOKEEPER-2557-3.5.patch,
> ZOOKEEPER-2557.2.patch, ZOOKEEPER-2557.patch
>
>
> We are in the process of moving from subversion to git, but I have seen that
> the current ZK's {{gitignore}} doesn't account for many spurious types of
> files (e.g., *.swp, *.tmp) as well as other files created by IDEs (Eclipse,
> Intellij and NetBeans), among other file extensions.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)