Re: Git (Was: Plan for Struts 3)

2012-12-17 Thread Lukasz Lenart
2012/12/6 Christian Grobmeier : > There are some minor things I found: > > - the develop branch needs to be used in CI. Not a big deal, but somehow we > need to tell it the CI Yes, you can - there is option branches to build > - what about feature branches? Should they all go remote? When are the

Re: Git (Was: Plan for Struts 3)

2012-12-06 Thread Christian Grobmeier
On Thu, Dec 6, 2012 at 12:43 PM, Rene Gielen wrote: > great and comprehensive writeup. Which brings me to what is really good > about not being the first time mover - being able to profit from other's > experiences. > > Unfortunately I have not so much more experience with GIT :-| Well, I tried t

Re: Git (Was: Plan for Struts 3)

2012-12-06 Thread Lukasz Lenart
2012/12/6 Rene Gielen : > For migrating current SVN repo content to Git, Infra prefers to > completely move an existing Git mirror repo. As I see it, we should > migrate struts2.git and arguably struts-sandbox.git and let the other > parts reside in SVN with Git morring only. I didn't think about

Re: Git (Was: Plan for Struts 3)

2012-12-06 Thread Rene Gielen
Christian, great and comprehensive writeup. Which brings me to what is really good about not being the first time mover - being able to profit from other's experiences. A nice glance into some Git-related discussions over at Incubator: http://markmail.org/message/6f7l3fjksjeem6li Wicket has full

Re: Git (Was: Plan for Struts 3)

2012-12-06 Thread Rene Gielen
This is an excellent question and part of the discussion I wanted to start (but wasn't able to follow up so far in the last busy days) Given that we decide for Git: As for me, it makes absolutely no sense to have a common origin codebase split up into two repositories. If we vote for developing S

Re: Git (Was: Plan for Struts 3)

2012-12-06 Thread Christian Grobmeier
On Thu, Dec 6, 2012 at 11:44 AM, Lukasz Lenart wrote: > 2012/12/6 Christian Grobmeier : >> Would be glad to look at your repos on github. >> >> One question: are we going to fix issues in Struts 2.x on SVN or are >> we going to have everything on GIT then? >> In the git-brnaching-model link I see

Re: Git (Was: Plan for Struts 3)

2012-12-06 Thread Lukasz Lenart
2012/12/6 Christian Grobmeier : > Would be glad to look at your repos on github. > > One question: are we going to fix issues in Struts 2.x on SVN or are > we going to have everything on GIT then? > In the git-brnaching-model link I see one development branch. I think > we would need a develop2x, d

Re: Git (Was: Plan for Struts 3)

2012-12-06 Thread Christian Grobmeier
On Thu, Dec 6, 2012 at 11:13 AM, Lukasz Lenart wrote: > 2012/11/28 Dave Newton : >> On Wed, Nov 28, 2012 at 4:42 PM, Christian Grobmeier wrote: >>> http://nvie.com/posts/a-successful-git-branching-model/ >> >> https://github.com/nvie/gitflow >> >> Yeah, I like the workflow quite a bit, although I'

Re: Git (Was: Plan for Struts 3)

2012-12-06 Thread Lukasz Lenart
2012/12/6 Lukasz Lenart : > The idea looks pretty nice, as we don't have a Git repo yet, I'm going > to fork struts2 on the GitHub and try to play a bit - especially with > release process Updated the plan with links about Git flow https://cwiki.apache.org/confluence/display/WW/Struts+3 Regards

Re: Git (Was: Plan for Struts 3)

2012-12-06 Thread Lukasz Lenart
2012/11/28 Dave Newton : > On Wed, Nov 28, 2012 at 4:42 PM, Christian Grobmeier wrote: >> http://nvie.com/posts/a-successful-git-branching-model/ > > https://github.com/nvie/gitflow > > Yeah, I like the workflow quite a bit, although I've only used it on a > couple of smallish projects. The idea l

Re: Git (Was: Plan for Struts 3)

2012-11-28 Thread Dave Newton
On Wed, Nov 28, 2012 at 4:42 PM, Christian Grobmeier wrote: > http://nvie.com/posts/a-successful-git-branching-model/ https://github.com/nvie/gitflow Yeah, I like the workflow quite a bit, although I've only used it on a couple of smallish projects. Dave

Re: Git (Was: Plan for Struts 3)

2012-11-28 Thread Christian Grobmeier
On Wed, Nov 28, 2012 at 8:36 PM, Lukasz Lenart wrote: > 2012/11/28 Rene Gielen : >> Moving development to the Git infrastructure ASF / Infra now provides is >> *not* a no-brainer, and it requires a little bit more than just a few +1s :) >> >> Let's step back, hold breath, and dive into serious dis

Re: Git (Was: Plan for Struts 3)

2012-11-28 Thread Lukasz Lenart
2012/11/28 Rene Gielen : > Moving development to the Git infrastructure ASF / Infra now provides is > *not* a no-brainer, and it requires a little bit more than just a few +1s :) > > Let's step back, hold breath, and dive into serious discussion about > that. I'm preparing a more detailed post, but

Git (Was: Plan for Struts 3)

2012-11-28 Thread Rene Gielen
Folks, I think right at this point we should fork discussion on methodology (Git) from new features as in the rest of this thread. Moving development to the Git infrastructure ASF / Infra now provides is *not* a no-brainer, and it requires a little bit more than just a few +1s :) Let's step back