> -----Original Message----- > From: David Nalley [mailto:[email protected]] > Sent: Wednesday, August 01, 2012 3:05 PM > To: [email protected] > Subject: Re: Review Request: Merge Kelven's VPC code for Vmware into > asf vpc branch > > On Wed, Aug 1, 2012 at 5:55 PM, Ewan Mellor <[email protected]> > wrote: > >> -----Original Message----- > >> From: Chip Childers [mailto:[email protected]] > >> Sent: Wednesday, August 01, 2012 2:39 PM > >> To: <[email protected]> > >> Cc: David Nalley; Kelven Yang; Alena Prokharchyk > >> Subject: Re: Review Request: Merge Kelven's VPC code for Vmware into > >> asf vpc branch > >> > >> On Aug 1, 2012, at 5:21 PM, Vijayendra Bhamidipati > >> <[email protected]> wrote: > >> > >> > Hi David, > >> > > >> > This is Kelven's code that he checked in to the 3.0.x branch - I'm > >> only merging it to the asf branch. After the recent code re-org, > >> cherry-picking the patches wouldn't work, so I had to merge the code > >> for each file. > >> > >> When you say ASF branch, are we talking about code being developed > >> privately inside of Citrix, and then sent to review board for > >> inclusion into the master branch within the ASF repo? > > > > Yes, Citrix has a number of feature branches that we've been holding > because we didn't know what we were doing with them while the 4.0 legal > and policy issues were sorted out. > > > > Now that we've got a release plan for 4.0, we're getting all that > code merged and published. > > > > Cheers, > > > > Ewan. > > > > The problem with that is that entire features that are not developed > within the project have a different process for inclusion. > Particularly when they are features that multiple people have > collaborated on externally.
Could you define "within the project"? git is designed for a workflow where someone takes a branch, collaborates for a bit on it, and then comes back with the finished changes. This is exactly what has happened here, and it's the kind of thing that happens in the Linux kernel (for example) all the time. Ewan.
