On Wed, Feb 20, 2013 at 02:23:11PM -0800, Animesh Chaturvedi wrote: > Chip > > I posted this in another thread where 72 hour was called out, >
Yup - and I figured we could bring that discussion into this new thread. > > Do we really need to wait 72 hours for all merge requests? I feel that slows > developers down unless they plan very well. We had similar discussion just 3 > weeks back and it was discussed that it depends on the scope and dependencies > with other modules on case-by-case basis. If all discussion and development > and review has happened by community and if it is isolated feature merge can > be done quickly. > > Here is link to that discussion. > > http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev/201301.mbox/%3c93099572b72eb341b81a644e134f240b012f747fe...@sjcpmailbox01.citrite.net%3E > So here's what I said last time: > Purely IMO, I think that if the discussion has already happened on the > dev list > about requirements and FS, the code has been looked at by others (or > people have had the opportunity to look at it), you have tested and > feel > confident, then the MERGE request is really a notification to make > sure folks > know you are going to do it. It will entirely depend on the nature > (scope) of > the changes. An isolated feature can probably be merged very quickly > with > little debate. The question is really "has the community had an opportunity to review the code". When I wrote that, I was frankly thinking along the lines that committers would follow the "do the right thing" model. However, if we believe that we need to document expectations in a more formal way (as requested by several others), then I think we need to document clear guidelines that are easy to follow and are as unambiguous as possible. So, again, IMO I'd be willing to be less structured about this if the intent of keeping master "stable" and giving the community enough time to review proposed changes is met. But how do we codify that? Do we just include the intentions and goals in the wiki page, and leave it at that? I'm more than open to suggested edits! Feel free suggest or make updates to the draft. > > > > -----Original Message----- > > From: Chip Childers [mailto:chip.child...@sungard.com] > > Sent: Wednesday, February 20, 2013 2:04 PM > > To: cloudstack-dev@incubator.apache.org > > Subject: Branch Merge Expectations - Draft for Discussion > > > > Hi all, > > > > I spent some time working on a draft of "branch merge expectations" [1], and > > I'd really like to get feedback on it. > > > > Did I document our consensus on the topic correctly? Is everyone > > comfortable > > with these guidelines? Did I miss anything? > > > > -chip > > > > [1] > > https://cwiki.apache.org/confluence/display/CLOUDSTACK/Branch+Merge+Exp > > ectations >
