Re: [Geoserver-devel] WMS cascading and version control

2010-05-05 Thread Andrea Aime
Justin Deoliveira ha scritto: > On 5/5/10 12:27 AM, Andrea Aime wrote: >> Ben Caradoc-Davies ha scritto: >>> On 30/04/10 00:41, Justin Deoliveira wrote: I have become quite a proponent of git these days, i use it for all local development and for branch development nothing beats it. >>> >

Re: [Geoserver-devel] WMS cascading and version control

2010-05-05 Thread Justin Deoliveira
On 5/5/10 12:27 AM, Andrea Aime wrote: > Ben Caradoc-Davies ha scritto: >> On 30/04/10 00:41, Justin Deoliveira wrote: >>> I have become quite a proponent of git these days, i use it for all >>> local development and for branch development nothing beats it. >> >> I have seen the git header in your

Re: [Geoserver-devel] WMS cascading and version control

2010-05-04 Thread Andrea Aime
Ben Caradoc-Davies ha scritto: > On 30/04/10 00:41, Justin Deoliveira wrote: >> I have become quite a proponent of git these days, i use it for all >> local development and for branch development nothing beats it. > > I have seen the git header in your patches. :-) I have to second Justin's opin

Re: [Geoserver-devel] WMS cascading and version control

2010-05-04 Thread Ben Caradoc-Davies
On 30/04/10 00:41, Justin Deoliveira wrote: > I have become quite a proponent of git these days, i use it for all > local development and for branch development nothing beats it. I have seen the git header in your patches. :-) -- Ben Caradoc-Davies Software Engineering Team Leader CSIRO Earth

Re: [Geoserver-devel] WMS cascading and version control

2010-04-29 Thread Andrea Aime
David Winslow ha scritto: > Something to keep in mind is that git's svn integration can't push > "merge commits" (ie, where two git branches join back together, > something that should come up a lot in collaborative situation) from git > to SVN. You *can* have as many branches off of a SVN sour

Re: [Geoserver-devel] WMS cascading and version control

2010-04-29 Thread David Winslow
Something to keep in mind is that git's svn integration can't push "merge commits" (ie, where two git branches join back together, something that should come up a lot in collaborative situation) from git to SVN. You *can* have as many branches off of a SVN source tree as you want, but you will

Re: [Geoserver-devel] WMS cascading and version control

2010-04-29 Thread Justin Deoliveira
I have become quite a proponent of git these days, i use it for all local development and for branch development nothing beats it. The reason being the rebasing. A few more comments inline. On 4/28/10 8:49 AM, Jody Garnett wrote: > Trunk is open for new development; any idea on the time frame fo

Re: [Geoserver-devel] WMS cascading and version control

2010-04-28 Thread Jody Garnett
Trunk is open for new development; any idea on the time frame for WMS cascade work? Do we have any need to release from trunk prior to FOSS4G (ie early July deadline). I do like the idea of trying out GIT on a "shared branch" like this. It would give us a chance to learn. Aside: Jesse took a

[Geoserver-devel] WMS cascading and version control

2010-04-28 Thread Andrea Aime
Hi, the WMS cascading work is about to start, we'll need a place where multiple people can share their work. Options: - work directly on trunk. Upsides: it's easy, requires no extra setup/software Downsides: it might result in breakages of trunk - create a branch Upsides: requires no extr