Just because you don't see the need, doesn't mean it it should be
actively discourage. Adding that wildcard commit to trunk will
discourage these other tools.
On 05/18/2014 10:10 PM, Hans Bakker wrote:
Adam,
i looked at sub modules and git-tree, they are adding even more
complexity to the already complex GIT and sorry i do not see the
advantage.
Loading the components into hot-deploy from a separate git repository
is working well here, however one need to ignore the hot-deploy
content otherwise git will block you creating a new branch and
'clean' will otherwise delete them.
ok, when there is no support for this will do it locally which is now
much easier with Git anyway.
Regards, Hans
On 19/05/14 09:43, Adam Heath wrote:
I'm the one who originally added this file. Hans, you're wrong.
Not everyone does git integration work the same way. Some might use
symlinks in hot-deploy, linked to locations outside of the ofbiz
tree. In those cases, the symlinks should be maintained in the
parent repo.
Other methods might make use of git modules; excluding * is most
definitely wrong.
If you want to ignore stuff in your own hot-deploy, add the ignore
locally, or create a new hot-deploy/.gitignore.
ps: I seem to not be able to commit, maybe my password is wrong. I'll
have to fix that.
On 05/18/2014 08:38 PM, Hans Bakker wrote:
With a proper installation, hot-deploy components will come from a
different git repository and should not be stored together in order
to be able to keep your ofbiz installation in sync with the ofbiz
svn repository.
If they are not ignored, and you install ofbiz and later the
components in hot-deploy, then do a 'git clean' your components are
deleted....
That is why it should be ignored by the OFBiz installation.
But as usual Jacques, up to you , however it shows you are not using
git at all.....
Regards, Hans
On 18/05/14 17:58, Jacques Le Roux wrote:
-hot-deploy/*/build
+hot-deploy/*
+!hot-deploy/README.txt
This change does not make sense. It will force people who use Git
to search why their added component/s are ignored, I will revert it!
I add 2 other changes I have pending for months:
runtime/indexes/products/
So I agree with this one
What about adding?
framework/entity/lib/jdbc
I was reluctant because it might hide downloaded, JDBC drivers, not
sure... opinions?
Jacques
Le 15/05/2014 04:24, hans...@apache.org a écrit :
Author: hansbak
Date: Thu May 15 02:24:27 2014
New Revision: 1594758
URL: http://svn.apache.org/r1594758
Log:
update git ignore for product indexes and components in hot-deploy
Modified:
ofbiz/trunk/.gitignore
Modified: ofbiz/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/.gitignore?rev=1594758&r1=1594757&r2=1594758&view=diff
==============================================================================
--- ofbiz/trunk/.gitignore (original)
+++ ofbiz/trunk/.gitignore Thu May 15 02:24:27 2014
@@ -4,7 +4,8 @@ framework/base/lib/cobertura-*.jar
framework/base/lib/asm*.jar
framework/base/lib/oro*.jar
framework/entity/lib/jdbc/postgresql-*.jar
-hot-deploy/*/build
+hot-deploy/*
+!hot-deploy/README.txt
specialpurpose/*/build
applications/content/index/
bin/
@@ -25,6 +26,7 @@ runtime/data/utilcache.*
runtime/catalina/work/*
runtime/jetty
runtime/tempfiles/*
+runtime/indexes/products/
themes/flatgrey/webapp/flatgrey/javascript-min.css
themes/flatgrey/webapp/flatgrey/js/application-min.js
themes/flatgrey/webapp/flatgrey/maincss-min.css
