I think Animesh is just stating that there is a use case for developers to only fix a bug that's in the master branch. For example, a feature that's been introduced in master that someone logged a ticket for would only have a fix put in in master.
If the bug is in 4.4.1 and a fix goes in, it should go into 4.4.1 first and then be ported to master, as you say, Daan. On Sat, Oct 11, 2014 at 5:07 PM, Daan Hoogland <daan.hoogl...@gmail.com> wrote: > I am stating that any bugfix should fix the bug that is out there first and > hence go into the release branch first and in master second! > > To reassert my last statement; it is very correct! The attention that has > gone into bugfixing in master should not have gone there. It should have > gone into release branch and only after that merging fixes back into master > should happen. > > On Sat, Oct 11, 2014 at 5:24 PM, Animesh Chaturvedi < > animesh.chaturv...@citrix.com> wrote: > > > I am not saying that. I am saying bug fixes should remain. > > > > Your last statement is not correct every bug fix should always go in > > master not just release branches. > > > > Sent from my iPhone > > > > On Oct 11, 2014, at 3:58 AM, "Daan Hoogland" <daan.hoogl...@gmail.com> > > wrote: > > > > I think we need to revert a lot, Animesh. I don't think you can say > > that all the commits since the 1st amount to bugfixes. At least they are > > not commented as such. And if so, they should have gone into 4.4, not > > master. > > > > On Fri, Oct 10, 2014 at 8:19 PM, Animesh Chaturvedi < > > animesh.chaturv...@citrix.com> wrote: > > > >> > >> > >> > -----Original Message----- > >> > From: David Nalley [mailto:da...@gnsa.us] > >> > Sent: Thursday, October 09, 2014 10:20 PM > >> > To: Daan Hoogland > >> > Cc: dev > >> > Subject: Re: [ACS45]reverting commits or branching? > >> > > >> > I agree - it makes no sense - I am working on a branch minus the > latest > >> few > >> > features. I'm not done with it, but hope to have something up by end > of > >> the > >> > weekend. > >> > > >> [Animesh] Yes we cannot delay the release branch. David, can you confirm > >> that the bug fixes that were committed will be there. > >> > >> > --David > >> > > >> > On Thu, Oct 9, 2014 at 5:45 AM, Daan Hoogland < > daan.hoogl...@gmail.com> > >> > wrote: > >> > > H David, > >> > > > >> > > since our test day last weeks a lot of commits have gone into > master. > >> > > I saw Wilder's report coming by a week later followed by a lot of > >> commits > >> > again. > >> > > It seems to me we should revert any commit dating October. It makes > no > >> > > sense waiting with branching this way. 4.4.1 is not done and needs > yet > >> > > another spin... > >> > > > >> > > agree? > >> > > -- > >> > > Daan > >> > > > > > > > > -- > > Daan > > > > > > > -- > Daan > -- *Mike Tutkowski* *Senior CloudStack Developer, SolidFire Inc.* e: mike.tutkow...@solidfire.com o: 303.746.7302 Advancing the way the world uses the cloud <http://solidfire.com/solution/overview/?video=play>*™*
