Re: git (yet again)

2014-09-03 Thread Martin Grigorov
On Thu, Sep 4, 2014 at 12:46 AM, sebb wrote: > On 3 September 2014 16:10, Martin Grigorov wrote: > > On Wed, Sep 3, 2014 at 2:54 PM, Stefan Bodewig > wrote: > > > >> On 2014-09-03, sebb wrote: > >> > >> > Maybe it's possible to configure the commit messages so that diffs are > >> > shown; if no

Re: git (yet again)

2014-09-03 Thread sebb
On 3 September 2014 16:10, Martin Grigorov wrote: > On Wed, Sep 3, 2014 at 2:54 PM, Stefan Bodewig wrote: > >> On 2014-09-03, sebb wrote: >> >> > Maybe it's possible to configure the commit messages so that diffs are >> > shown; if not, then perhaps there needs to be a convention for how to >> >

Re: git (yet again)

2014-09-03 Thread Martin Grigorov
On Wed, Sep 3, 2014 at 2:54 PM, Stefan Bodewig wrote: > On 2014-09-03, sebb wrote: > > > Maybe it's possible to configure the commit messages so that diffs are > > shown; if not, then perhaps there needs to be a convention for how to > > comment on commits. > > Might be something that can be conf

Re: git (yet again)

2014-09-03 Thread Stefan Bodewig
On 2014-09-03, sebb wrote: > Maybe it's possible to configure the commit messages so that diffs are > shown; if not, then perhaps there needs to be a convention for how to > comment on commits. Might be something that can be configured per project, we do get diffs for commits in Ant-land: for exa

Re: git (yet again)

2014-09-03 Thread Martin Grigorov
Hi all, On Sep 3, 2014 12:42 PM, "Rainer Jung" wrote: > > > Am 02.09.2014 um 18:41 schrieb Mark Thomas: > >> I've been looking at this again (anything to get a break from writing >> parsers for cookies) and chatting with some of the infra folks that look >> after the ASF's git repos. >> >> There

Re: git (yet again)

2014-09-03 Thread Emmanuel Bourg
Le 03/09/2014 12:17, sebb a écrit : > Maybe it's possible to configure the commit messages so that diffs are > shown; if not, then perhaps there needs to be a convention for how to > comment on commits. I confirm this is possible, here is for example a commit message for a change on the tomcat8 p

Re: git (yet again)

2014-09-03 Thread sebb
On 3 September 2014 10:41, Rainer Jung wrote: > > Am 02.09.2014 um 18:41 schrieb Mark Thomas: > >> I've been looking at this again (anything to get a break from writing >> parsers for cookies) and chatting with some of the infra folks that look >> after the ASF's git repos. >> >> There are a coupl

Re: git (yet again)

2014-09-03 Thread Rainer Jung
Am 02.09.2014 um 18:41 schrieb Mark Thomas: I've been looking at this again (anything to get a break from writing parsers for cookies) and chatting with some of the infra folks that look after the ASF's git repos. There are a couple of things we need to do: a) decide how we want to organise dev

Re: git (yet again)

2014-09-03 Thread Mark Thomas
On 02/09/2014 20:28, Konstantin Kolinko wrote: > In July I successfully configured Git to operate on the same set of > files as Subversion, on Windows. Neat. I use completely separate git and svn checkouts and swap between them as the mood suits me. As I get more familiar with git then I am using

Re: git (yet again)

2014-09-02 Thread Rémy Maucherat
2014-09-02 22:49 GMT+02:00 Violeta Georgieva : > One more thing - in github you can make inline comments for a given > commit/pull request. > This is very convenient for a review purposes. > Well, I guess since it is mirrored in github, you can comment there. About the patching process, I would

Re: git (yet again)

2014-09-02 Thread Violeta Georgieva
2014-09-02 23:22 GMT+03:00 Violeta Georgieva : > > Hi, > > > 2014-09-02 22:15 GMT+03:00 Mark Thomas : > > > > ... > > > It is up to us. > > > > > > The current svn setup is a single repo. > > > > > > My preference is for a single git repo with branches for 7.0.x and 6.0.x > > +1 one repo with man

Re: git (yet again)

2014-09-02 Thread Violeta Georgieva
Hi, 2014-09-02 22:15 GMT+03:00 Mark Thomas : > > ... > It is up to us. > > > The current svn setup is a single repo. > > > My preference is for a single git repo with branches for 7.0.x and 6.0.x +1 one repo with many branches master is the latest development in our case 8.0.x at the moment >

Re: git (yet again)

2014-09-02 Thread Henri Gomez
> Let's skip Maven and move straight to Gradle, it has the benefit of not > needing a build system installed on the developers machine, as it gets > downloaded by the wrapper checked into the repo. This is yet one less > version that is required by the contributor. > It's built on top of Ant, and s

Re: git (yet again)

2014-09-02 Thread sebb
On 2 September 2014 20:25, Filip Hanik wrote: > On Tue, Sep 2, 2014 at 10:52 AM, Rémy Maucherat wrote: > >> 2014-09-02 18:41 GMT+02:00 Mark Thomas : >> >> > I'm leaning towards A myself. >> > > > The move to git clears a huge hurdle, and that is managing contributions. > The patch system is very

Re: git (yet again)

2014-09-02 Thread Konstantin Kolinko
2014-09-02 20:41 GMT+04:00 Mark Thomas : > I've been looking at this again (anything to get a break from writing > parsers for cookies) and chatting with some of the infra folks that look > after the ASF's git repos. > > There are a couple of things we need to do: > a) decide how we want to organis

Re: git (yet again)

2014-09-02 Thread Filip Hanik
On Tue, Sep 2, 2014 at 10:52 AM, Rémy Maucherat wrote: > 2014-09-02 18:41 GMT+02:00 Mark Thomas : > > > I'm leaning towards A myself. > ​ The move to git clears a huge hurdle, and that is managing contributions. The patch system is very difficult, and impossible to maintain. A pull request stays

Re: git (yet again)

2014-09-02 Thread Henri Gomez
>The git repo would be mirrored at github. Folks can open pull requests >at gitbuh now and we can close them when we commit the changes. That >won't change if we switch to git. There is mecansims to merge pull-requests for GitHub in Git ASF ? How is documented somewhere ? > > Side note, did infr

Re: git (yet again)

2014-09-02 Thread Mark Thomas
On 02/09/2014 19:31, Henri Gomez wrote: > About git workflow. > > Github popularized fork/pull-request mode and it helped enrolled tons of > new developpers in many Git projects, in Github but not only. > Would it be something possible with current Git infra in ASF ? The git repo would be mirrore

Re: git (yet again)

2014-09-02 Thread Mark Thomas
On 02/09/2014 19:24, Sylvain Laurent wrote: > Regarding question b), I vote yes, whatever the organization of the > development > > Regarding a), for my part I rather see something between A and B. I think of > the following questions that should be answered first : > - will there be 1 repo per

Re: git (yet again)

2014-09-02 Thread Henri Gomez
About git workflow. Github popularized fork/pull-request mode and it helped enrolled tons of new developpers in many Git projects, in Github but not only. Would it be something possible with current Git infra in ASF ? Side note, did infra folks plans to use a new git hosting ? Using Stash, Gitlab

Re: git (yet again)

2014-09-02 Thread Henri Gomez
Maven Strike back ? That would be a very good new and our friend Olivier Lamy will be more than happy :) 2014-09-02 18:52 GMT+02:00 Rémy Maucherat : > 2014-09-02 18:41 GMT+02:00 Mark Thomas : > > > I'm leaning towards A myself. > > > > Oh wow, does this mean I can resurrect my thread on Maven t

Re: git (yet again)

2014-09-02 Thread Sylvain Laurent
Regarding question b), I vote yes, whatever the organization of the development Regarding a), for my part I rather see something between A and B. I think of the following questions that should be answered first : - will there be 1 repo per major version like the current SVN setup ? or only branc

Re: git (yet again)

2014-09-02 Thread Rémy Maucherat
2014-09-02 18:41 GMT+02:00 Mark Thomas : > I'm leaning towards A myself. > Oh wow, does this mean I can resurrect my thread on Maven too ? (ideally, we should also move to it first, then think about how to use it later, otherwise people will never vote in favor) :) Rémy

git (yet again)

2014-09-02 Thread Mark Thomas
I've been looking at this again (anything to get a break from writing parsers for cookies) and chatting with some of the infra folks that look after the ASF's git repos. There are a couple of things we need to do: a) decide how we want to organise development in git b) decide if we want to move to