Re: Podling to use native git

2010-10-02 Thread Dennis Lundberg
ri, 10/1/10, Greg Stein wrote: > >> From: Greg Stein >> Subject: Re: Podling to use native git >> To: general@incubator.apache.org >> Date: Friday, October 1, 2010, 11:07 PM >> Yup. The 1.5.x release introduced a >> feature called "merge tracking", >>

Re: Podling to use native git

2010-10-02 Thread Mark Struberg
late ;) LieGrue, strub --- On Fri, 10/1/10, Greg Stein wrote: > From: Greg Stein > Subject: Re: Podling to use native git > To: general@incubator.apache.org > Date: Friday, October 1, 2010, 11:07 PM > Yup. The 1.5.x release introduced a > feature called "merge tracking&

Re: Podling to use native git

2010-10-01 Thread Greg Stein
both got marked as conflict. > > Anyway, SVN is the way to go for now. > > LieGrue, > strub > > --- On Fri, 10/1/10, Jochen Wiedmann wrote: > >> From: Jochen Wiedmann >> Subject: Re: Podling to use native git >> To: general@incubator.apache.org >> Da

Re: Podling to use native git

2010-10-01 Thread Benson Margulies
ry 2nd > day). Somehow I ended up having the same pieces in my branch and in my trunk, > but both got marked as conflict. > > Anyway, SVN is the way to go for now. > > LieGrue, > strub > > --- On Fri, 10/1/10, Jochen Wiedmann wrote: > >> From: Jochen Wiedmann

Re: Podling to use native git

2010-10-01 Thread Mark Struberg
my branch ~ every 2nd day). Somehow I ended up having the same pieces in my branch and in my trunk, but both got marked as conflict. Anyway, SVN is the way to go for now. LieGrue, strub --- On Fri, 10/1/10, Jochen Wiedmann wrote: > From: Jochen Wiedmann > Subject: Re: Podling to use

Re: Podling to use native git

2010-10-01 Thread Jochen Wiedmann
On Fri, Oct 1, 2010 at 11:44 PM, Greg Stein wrote: > I do branches all the time in Subversion, and don't see problems. We > periodically update the branch from trunk, and when the work is done, > merge the branch back onto trunk. These are straight-forward > operations, so I don't understand wher

Re: Podling to use native git

2010-10-01 Thread Greg Stein
On Fri, Oct 1, 2010 at 04:45, Mark Struberg wrote: >> > I think it's really worse, as branches aren't maintained >> > anymore in the apache svn area, > > yes, and anyone ever asked yourself _why_ this happens? > The answer imo is: because its _sooo_ painful to do feature branches in SVN > (and me

Re: Podling to use native git

2010-10-01 Thread Mattmann, Chris A (388J)
Hi Guys, As the project's champion I'll work with the rest of the mentors and PPMC members to make sure we are moving forward in the Apache Way. Cheers, Chris On 10/1/10 2:23 AM, "Bertrand Delacretaz" wrote: Hi, On Thu, Sep 30, 2010 at 2:02 PM, Enis Soztutar wrote: > ..In the preparation

Re: Podling to use native git

2010-10-01 Thread Enis Soztutar
Hi, On Fri, Oct 1, 2010 at 12:23 PM, Bertrand Delacretaz wrote: > Hi, > > On Thu, Sep 30, 2010 at 2:02 PM, Enis Soztutar > wrote: > > ..In the preparation phase for the recent Gora podling, I realized that > the > > code needs be restructured to subversion layout. However, most of the > > devel

RE: Podling to use native git

2010-10-01 Thread Gav...
> -Original Message- > From: Florent Guillaume [mailto:f...@nuxeo.com] > Sent: Friday, 1 October 2010 7:52 PM > To: general@incubator.apache.org > Subject: Re: Podling to use native git > > On Fri, Oct 1, 2010 at 11:40 AM, Toni Menzel > wrote: > > I

Re: Podling to use native git

2010-10-01 Thread Toni Menzel
On Fri, Oct 1, 2010 at 11:52 AM, Florent Guillaume wrote: > On Fri, Oct 1, 2010 at 11:40 AM, Toni Menzel wrote: >> Its now the question to balance innovation (hence "coolness") and >> solid, well well known processes. >> Its also that Subversion is still the king in corporates (well, >> together

Re: Podling to use native git

2010-10-01 Thread Florent Guillaume
On Fri, Oct 1, 2010 at 11:40 AM, Toni Menzel wrote: > Its now the question to balance innovation (hence "coolness") and > solid, well well known processes. > Its also that Subversion is still the king in corporates (well, > together with CVS). So you would attract a whole different kind of > devel

Re: Podling to use native git

2010-10-01 Thread Toni Menzel
done with git-submodules, which is much less handy. >> > >> > So I'm with Gav here: we need to evaluate this in multiple steps >> > >> > 1st) in theory, and later >> > 2nd) via an incubator podling project >> > >> > If it turns out t

Re: Podling to use native git

2010-10-01 Thread Bertrand Delacretaz
Hi, On Thu, Sep 30, 2010 at 2:02 PM, Enis Soztutar wrote: > ..In the preparation phase for the recent Gora podling, I realized that the > code needs be restructured to subversion layout. However, most of the > developers here prefer the git way and will never use subversion except for > committin

Re: Podling to use native git

2010-10-01 Thread Enis Soztutar
te this in multiple steps > > > > 1st) in theory, and later > > 2nd) via an incubator podling project > > > > If it turns out that we cannot live with GIT, then we could still import > > all the history of 'master' into our SVN. > > > > LieG

Re: Podling to use native git

2010-10-01 Thread Guillaume Nodet
ith GIT, then we could still import > all the history of 'master' into our SVN. > > LieGrue, > strub > > > --- On Fri, 10/1/10, Guillaume Nodet wrote: > > > From: Guillaume Nodet > > Subject: Re: Podling to use native gi

Re: Podling to use native git

2010-10-01 Thread Mark Struberg
incubator podling project If it turns out that we cannot live with GIT, then we could still import all the history of 'master' into our SVN. LieGrue, strub --- On Fri, 10/1/10, Guillaume Nodet wrote: > From: Guillaume Nodet > Subject: Re: Podling to use native git > To: gen

Re: Podling to use native git

2010-10-01 Thread Guillaume Nodet
On Fri, Oct 1, 2010 at 09:44, Gav... wrote: > > > > -Original Message- > > From: Guillaume Nodet [mailto:gno...@gmail.com] > > Sent: Friday, 1 October 2010 5:11 PM > > To: general@incubator.apache.org > > Subject: Re: Podling to use native git &g

RE: Podling to use native git

2010-10-01 Thread Gav...
> -Original Message- > From: Guillaume Nodet [mailto:gno...@gmail.com] > Sent: Friday, 1 October 2010 5:11 PM > To: general@incubator.apache.org > Subject: Re: Podling to use native git > > I do agree with you. I don't really get this argument either. >

Re: Podling to use native git

2010-10-01 Thread Guillaume Nodet
g off commits. So each committer who pushes to the > central repo 'signs' that the contribution is ASL licensed. > > LieGrue, > stru > > --- On Thu, 9/30/10, Noel J. Bergman wrote: > > > From: Noel J. Bergman > > Subject: RE: Podling to use native git >

RE: Podling to use native git

2010-09-30 Thread Mark Struberg
tely. GIT even supports signing off commits. So each committer who pushes to the central repo 'signs' that the contribution is ASL licensed. LieGrue, stru --- On Thu, 9/30/10, Noel J. Bergman wrote: > From: Noel J. Bergman > Subject: RE: Podling to use native git > To: genera

RE: Podling to use native git

2010-09-30 Thread Noel J. Bergman
> Does any other podling use git-only workflow. No ASF project is permitted to use git-only. And the typical git workflow is part of the problem. We strongly believe in a single, central, repository as part of the process of community building. The git model is better suited to disparate gro

Re: Podling to use native git

2010-09-30 Thread Upayavira
On Thu, 2010-09-30 at 15:02 +0300, Enis Soztutar wrote: > Hi, > > In the preparation phase for the recent Gora podling, I realized that the > code needs be restructured to subversion layout. However, most of the > developers here prefer the git way and will never use subversion except for > commi

Podling to use native git

2010-09-30 Thread Enis Soztutar
Hi, In the preparation phase for the recent Gora podling, I realized that the code needs be restructured to subversion layout. However, most of the developers here prefer the git way and will never use subversion except for committing the patches. So, I want to ask : - Does any other podling use