Agree with Prachi and Alena here. As a developer, I am more towards having "developer" branch as a staging area to periodically merge into master when CI pass on it, this is the simplest way to make master branch stable, if that is the original intention of this proposal.
Also, before we figure out all the details of the proposal, we should not start implementing and adopting the process. -min On 8/5/14 3:55 PM, "Prachi Damle" <prachi.da...@citrix.com> wrote: >I fail to understand how will this model help us with the maintenance >releases? > >For CloudStack we also keep working on prior releases and ship out >maintenance releases. >I suppose we will be cutting the maintenance releases from the release >branches? So we will have to keep around the release branches for that >purpose. > >In that case isn't master branch a redundant copy of the release branches? > >I think what we really need is having a staging branch where CI runs and >pushes code to master only if CI passes in turn keeping master stable. >I think 'develop' branch should serve such use. > > >Thanks, >Prachi > >-----Original Message----- >From: Sebastien Goasguen [mailto:run...@gmail.com] >Sent: Tuesday, August 05, 2014 2:56 PM >To: dev@cloudstack.apache.org >Subject: Re: [VOTE] git workflow > > >On Aug 5, 2014, at 2:33 PM, Jessica Wang <jessica.w...@citrix.com> wrote: > >> Exactly. This just shifts pain from one branch to another. >> I don't see any gains from this, either. >> I vote "-1". >> > >It is much more than shifting pains, the wiki page is not discussion the >workflow quite extensively, with several pointers that we should all take >the time to view/read: > >https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git > > >> Jessica >> >> >> -----Original Message----- >> From: Min Chen [mailto:min.c...@citrix.com] >> Sent: Tuesday, August 05, 2014 11:27 AM >> To: dev@cloudstack.apache.org >> Subject: Re: [VOTE] git workflow >> >> Agree with Animesh. Didn't see any gains from this, we just shift pain >> from one branch to another, so vote -1. >> >> -min >> >> On 8/2/14 9:50 PM, "Animesh Chaturvedi" >> <animesh.chaturv...@citrix.com> >> wrote: >> >>> +0 >>> >>> While this protects master with only commits which are merges from >>> release branch and keeps it clean but the issues that we have shift >>> to develop branch. >>> >>> >>>> -----Original Message----- >>>> From: Rajani Karuturi [mailto:rajani.karut...@citrix.com] >>>> Sent: Thursday, July 31, 2014 3:28 AM >>>> To: dev >>>> Subject: [VOTE] git workflow >>>> >>>> Hi All, >>>> >>>> We had long discussions on the git flow. >>>> I tried to capture the summary of it @ >>>> http://markmail.org/message/j5z7dxjcqxfkfhpj >>>> This is updated on wiki @ >>>> https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git#Git- >>>> ProposedGitflowbasedCheck-inProcess and is up for a vote: >>>> >>>> Can you share your opinion on the proposal? >>>> >>>> [ ] +1 approve >>>> [ ] +0 no opinion >>>> [ ] -1 disapprove (and reason why) >>>> >>>> >>>> Thanks, >>>> ~Rajani >>>> >>>> >>> >> >
