Thanks Ben that was *so* much better than what I was doing. Jody On 14/09/2010, at 11:19 AM, Ben Caradoc-Davies wrote:
> .gitignore files nest: git will apply the rules in the topmost .gitignore > first. I put this in the base working directory for geotools trunk and I'm > done: > > ###### a .gitignore for geotools trunk ####### > > .gitignore > > # maven > target/ > > # eclipse > .project > .classpath > .settings/ > > # cruft > docs/common.pyc > modules/plugin/jdbc/jdbc-h2/null.4.log.db > modules/plugin/jdbc/jdbc-h2/null.data.db > modules/plugin/jdbc/jdbc-h2/null.index.db > modules/plugin/jdbc/jdbc-h2/null.trace.db > modules/unsupported/caching/filters.data > > ############# > > On 14/09/10 16:16, Jody Garnett wrote: >> So I have been able to do something by creating a ".gitignore" with >> >> .classpath >> .project >> target >> .gitignore >> .settings >> >> Trouble is I need to copy this into 40+ directories; I will only be working >> on trunk for a bit but that will still be a pain if I ever want to work on a >> branch? Part of why we were able to ignore .classpath and .project in >> geotools was because they were added to the "svn:ignore" property making it >> easy for people to keep on working and see their changes. >> >> Jody >> >> >> On 14/09/2010, at 9:37 AM, Jody Garnett wrote: >> >>> So can some kind git master tell me how git ignore works? I went from being >>> able to use git status to having a mess in one day :-) >>> >>> Jody >>> >>> On 14/09/2010, at 5:42 AM, Ben Caradoc-Davies wrote: >>> >>>> Done. >>>> >>>> I have removed .gitignore on trunk/2.6.x in r36193/r36194. >>>> >>>> Kind regards, >>>> Ben. >>>> >>>> On 09/09/10 17:27, Jesse Eichar wrote: >>>>> Go crazy. I didn't commit it intentionally and I agree with your >>>>> arguments >>>>> >>>>> On Thu, Sep 9, 2010 at 5:26 AM, Ben >>>>> Caradoc-Davies<ben.caradoc-dav...@csiro.au> wrote: >>>>> Jesse, you created this file, so I thought I'd check with you before we >>>>> blow it away! >>>>> >>>>> Objections? >>>>> >>>>> Regards, >>>>> Ben. >>>>> >>>>> >>>>> >>>>> On 08/09/10 15:46, Justin Deoliveira wrote: >>>>> +1 >>>>> >>>>> On Wed, Sep 8, 2010 at 7:47 AM, Ben >>>>> Caradoc-Davies<ben.caradoc-dav...@csiro.au> wrote: >>>>> I would like to remove .gitignore from GeoTools trunk and 2.6.x. >>>>> >>>>> Justin (see below) reports that, for GeoServer, he prefers to not have >>>>> .gitignore in the repo. Sounds like some other developers do the same. >>>>> >>>>> Keeping .gitignore in the repo reminds me of keeping .project and >>>>> .classpath in the repo: it seemed like a good idea at the time but it >>>>> breaks separation of concerns and there are other ways of doing it. >>>>> >>>>> If you have .gitignore under version control, you can't have a local >>>>> customisation, because having .gitignore in your .gitignore is ignored if >>>>> .gitignore is already in the index. (Parse that if you can!) This is a >>>>> problem if you are building crufty unsupported modules that nobody else >>>>> builds that dump junk outside target. Not to mention adding a new IDE >>>>> that has different cruft. Netbeans, anyone? Or Thumbs.db wherever there >>>>> are images, for Windows. In each case, .gitignore accumulates cruft and >>>>> via the repo transmits it to the entire community. Nobody will remove >>>>> cruft because nobody knows what tools are still in use by developers. >>>>> >>>>> So, can I remove .gitignore from GeoTools trunk and 2.6.x? >>>>> >>>>> (Gabriel, I'll leave the one in arcsde datastore for you to deal with.) >>>>> >>>>> Kind regards, >>>>> Ben. >>>>> >>>>> >>>>> -------- Original Message -------- >>>>> Subject: Re: [Geoserver-devel] .gitignore >>>>> Date: Wed, 18 Aug 2010 23:44:28 +0800 >>>>> From: David >>>>> Winslow<dwins...@opengeo.org<mailto:dwins...@opengeo.org><mailto:dwins...@opengeo.org<mailto:dwins...@opengeo.org>>> >>>>> To: Justin >>>>> Deoliveira<jdeol...@opengeo.org<mailto:jdeol...@opengeo.org><mailto:jdeol...@opengeo.org<mailto:jdeol...@opengeo.org>>> >>>>> CC: >>>>> geoserver-de...@lists.sourceforge.net<mailto:geoserver-de...@lists.sourceforge.net><mailto:geoserver-de...@lists.sourceforge.net<mailto:geoserver-de...@lists.sourceforge.net>> >>>>> >>>>> <geoserver-de...@lists.sourceforge.net<mailto:geoserver-de...@lists.sourceforge.net><mailto:geoserver-de...@lists.sourceforge.net<mailto:geoserver-de...@lists.sourceforge.net>>>, >>>>> Andrea >>>>> Aime<aa...@opengeo.org<mailto:aa...@opengeo.org><mailto:aa...@opengeo.org<mailto:aa...@opengeo.org>>> >>>>> >>>>> I just added .gitignore to my .gitignore. No major issues after initial >>>>> setup, except every once in a while I issue "git clean -dxf" (removes >>>>> non-versioned files from the working dir, leave out the 'x' to leave >>>>> ignored files alone) and blow away my ignore rules. >>>>> >>>>> -- >>>>> David Winslow >>>>> OpenGeo - http://opengeo.org/ >>>>> >>>>> On Tue, Aug 17, 2010 at 7:22 PM, Justin >>>>> Deoliveira<jdeol...@opengeo.org<mailto:jdeol...@opengeo.org><mailto:jdeol...@opengeo.org<mailto:jdeol...@opengeo.org>><mailto:jdeol...@opengeo.org<mailto:jdeol...@opengeo.org><mailto:jdeol...@opengeo.org<mailto:jdeol...@opengeo.org>>>> >>>>> wrote: >>>>> >>>>> I have found that having a .gitignore under version control is >>>>> problematic. In all my git repos i try to ensure it is not udner version >>>>> control. The reason being is because i started committing to it and the >>>>> changes get piled up on top of changed when you svn rebase. Future >>>>> rebases caused conflicts for me. Eventually i got to a point where i >>>>> could not rebase any longer. However in between was an update to the git >>>>> version i was using. >>>>> >>>>> Anyhow, at that point i decided to keep it out of version control to >>>>> ensure the head of my checkout is the latest from svn (on the master >>>>> branch at least). Others may have a better way of doing this. I would be >>>>> all ears to hear about how. >>>>> >>>>> -Justin >>>>> >>>>> >>>>> On Tue, Aug 17, 2010 at 2:21 PM, Gabriel >>>>> Roldan<grol...@opengeo.org<mailto:grol...@opengeo.org><mailto:grol...@opengeo.org<mailto:grol...@opengeo.org>><mailto:grol...@opengeo.org<mailto:grol...@opengeo.org><mailto:grol...@opengeo.org<mailto:grol...@opengeo.org>>>> >>>>> wrote: >>>>> >>>>> thanks Andrea that's useful. Already removed .gitignore from svn. >>>>> >>>>> Cheers, >>>>> Gabriel >>>>> On Aug 17, 2010, at 4:27 PM, Andrea Aime wrote: >>>>> >>>>> Gabriel Roldan ha scritto: >>>>> Hey git users, >>>>> I wonder how do you manage to keep .gitignore from being added to the >>>>> svn repository when doing git svn dcommit? >>>>> I'm pretty sure Andrea told me he's actively using dcommit, and I'm >>>>> sure I did it too in the past for geoserver but somehow .gitignore >>>>> was ignored? >>>>> >>>>> In my case I setup a global .gitignore in my home with the following >>>>> contents: >>>>> target >>>>> .project >>>>> .classpath >>>>> .settings >>>>> .springBeans >>>>> web/app/src/main/webapp/data/ >>>>> >>>>> And then I have no .gitignore files around in the checkout >>>>> >>>>> Cheers >>>>> Andrea >>>>> >>>>> -- >>>>> Andrea Aime >>>>> OpenGeo - http://opengeo.org >>>>> Expert service straight from the developers. >>>>> >>>>> >>>>> ------------------------------------------------------------------------------ >>>>> This SF.net email is sponsored by >>>>> >>>>> Make an app they can't live without >>>>> Enter the BlackBerry Developer Challenge >>>>> http://p.sf.net/sfu/RIM-dev2dev >>>>> _______________________________________________ >>>>> Geoserver-devel mailing list >>>>> geoserver-de...@lists.sourceforge.net<mailto:geoserver-de...@lists.sourceforge.net><mailto:geoserver-de...@lists.sourceforge.net<mailto:geoserver-de...@lists.sourceforge.net>><mailto:geoserver-de...@lists.sourceforge.net<mailto:geoserver-de...@lists.sourceforge.net><mailto:geoserver-de...@lists.sourceforge.net<mailto:geoserver-de...@lists.sourceforge.net>>> >>>>> >>>>> https://lists.sourceforge.net/lists/listinfo/geoserver-devel >>>>> >>>>> >>>>> >>>>> -- >>>>> Justin Deoliveira >>>>> OpenGeo - http://opengeo.org >>>>> Enterprise support for open source geospatial. >>>>> >>>>> >>>>> ------------------------------------------------------------------------------ >>>>> This SF.net email is sponsored by >>>>> >>>>> Make an app they can't live without >>>>> Enter the BlackBerry Developer Challenge >>>>> http://p.sf.net/sfu/RIM-dev2dev >>>>> _______________________________________________ >>>>> Geoserver-devel mailing list >>>>> geoserver-de...@lists.sourceforge.net<mailto:geoserver-de...@lists.sourceforge.net><mailto:geoserver-de...@lists.sourceforge.net<mailto:geoserver-de...@lists.sourceforge.net>><mailto:geoserver-de...@lists.sourceforge.net<mailto:geoserver-de...@lists.sourceforge.net><mailto:geoserver-de...@lists.sourceforge.net<mailto:geoserver-de...@lists.sourceforge.net>>> >>>>> >>>>> https://lists.sourceforge.net/lists/listinfo/geoserver-devel >>>>> >>>>> >>>>> >>>>> >>>>> -- >>>>> Ben Caradoc-Davies<ben.caradoc-dav...@csiro.au> >>>>> Software Engineering Team Leader >>>>> CSIRO Earth Science and Resource Engineering >>>>> Australian Resources Research Centre >>>>> >>>>> >>>>> >>>>> -- >>>>> Justin Deoliveira >>>>> OpenGeo - http://opengeo.org >>>>> Enterprise support for open source geospatial. >>>>> >>>>> >>>>> >>>>> >>>>> -- >>>>> Ben Caradoc-Davies<ben.caradoc-dav...@csiro.au> >>>>> Software Engineering Team Leader >>>>> CSIRO Earth Science and Resource Engineering >>>>> Australian Resources Research Centre >>>>> >>>> >>>> >>>> -- >>>> Ben Caradoc-Davies<ben.caradoc-dav...@csiro.au> >>>> Software Engineering Team Leader >>>> CSIRO Earth Science and Resource Engineering >>>> Australian Resources Research Centre >>>> >>>> ------------------------------------------------------------------------------ >>>> Start uncovering the many advantages of virtual appliances >>>> and start using them to simplify application deployment and >>>> accelerate your shift to cloud computing. >>>> http://p.sf.net/sfu/novell-sfdev2dev >>>> _______________________________________________ >>>> Geotools-devel mailing list >>>> Geotools-devel@lists.sourceforge.net >>>> https://lists.sourceforge.net/lists/listinfo/geotools-devel >>> >> >> > > > -- > Ben Caradoc-Davies <ben.caradoc-dav...@csiro.au> > Software Engineering Team Leader > CSIRO Earth Science and Resource Engineering > Australian Resources Research Centre ------------------------------------------------------------------------------ Start uncovering the many advantages of virtual appliances and start using them to simplify application deployment and accelerate your shift to cloud computing. http://p.sf.net/sfu/novell-sfdev2dev _______________________________________________ Geotools-devel mailing list Geotools-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geotools-devel