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?
Any case, I just couldn't keep it from being added to svn. Glad to roll it back, but still, how do I avoid that in the future?
TIA,
Gabriel
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.
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.
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 <groldan@anonymised.com> wrote:
thanks Andrea that’s useful. Already removed .gitignore from svn.
Cheers,
GabrielOn 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-devel@anonymised.comsts.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel
–
Justin Deoliveira
OpenGeo - http://opengeo.org
Enterprise support for open source geospatial.
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 <jdeolive@anonymised.com> 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 <groldan@anonymised.com> wrote:
thanks Andrea that’s useful. Already removed .gitignore from svn.
Cheers,
GabrielOn 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-devel@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-devel@anonymised.comsts.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel
David Winslow ha scritto:
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.
He, with great power comes great responsibility :-p
Cheers
Andrea
--
Andrea Aime
OpenGeo - http://opengeo.org
Expert service straight from the developers.