[
https://issues.apache.org/jira/browse/ZOOKEEPER-2557?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Edward Ribeiro updated ZOOKEEPER-2557:
--------------------------------------
Attachment: ZOOKEEPER-2557-3.4.patch
ZOOKEEPER-2557.patch
Hi [~phunt], [~cnauroth],
My previous patches for this issue failed because, even tough {{trunk}} and
{{branch-3.5}} are in sync wrt {{.gitignore}}, {{branch-3.4}} had some
additions lacking on {{trunk/branch-3.5}} *and vice-versa*, as we can see below:
{code}
eribeiro@WP0091:~/IdeaProjects/zookeeper(trunk)$ git diff trunk..branch-3.4 --
.gitignore
diff --git a/.gitignore b/.gitignore
index 2926274..2428fad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,22 @@
.classpath
.eclipse/
-.idea/
.project
.revision/
.settings/
build/
-out/
-*.iml
-src/c/core.*
-src/c/TEST-*.txt
-src/c/*.la
-src/c/*.lo
-src/c/*.o
src/c/generated/
src/java/generated/
src/java/lib/ant-eclipse-*
src/java/lib/ivy-*
+src/c/Makefile.in
+src/c/aclocal.m4
+src/c/autom4te.cache/
+src/c/compile
+src/c/config.guess
+src/c/config.h.in
+src/c/config.sub
+src/c/configure
+src/c/depcomp
+src/c/install-sh
+src/c/ltmain.sh
+src/c/missing
{code}
A straightforward approach would be to apply the patch to {{branch-3.4}} and
merge it upward, but I've found *a lot of conflicts with other files* when
going 3.4->3.5->trunk (mostly pdf files, but some Java sources too).
So, *I created two patches: one for {{trunk/branch-3.5}} (ZOOKEEPER-2557.patch)
and other for {{branch-3.4}} (ZOOKEEPER-2557-3.4.patch) *. Once committed,
.gitignore will be consistent across the branches (we can even do git
cherry-pick from branch-3.5 to trunk).
Still we may have some headaches with merging upwards with other files, but
this is a issue for another patch, right?
*Please, take a look to see if the final .gitignore makes sense, particularly
wrt the C files it ignores.* Thanks in advance.
> 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.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)
