[THRIFT-654] What is the best way to merge a bunch of code from Facebook?

• Type: Question
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 0.4
• Component/s: C++ - Library, Compiler (General), Java - Library, Python - Library
• Patch Info: Patch Available
• Assignee: David Reiss
• Reporter: David Reiss
• Created: 18/Dec/09 19:07
• Updated: 21/Aug/10 17:55
• Resolved: 21/Aug/10 17:55

Description

Hey guys. I've been kind of lax porting patches developed at Facebook back into the open-source repository, but I'm catching up now. I have a bunch of Apache-ready patches at http://gitweb.thrift-rpc.org/?p=thrift.git;a=shortlog;h=refs/heads/pri/dreiss/fb-merge-p1;hb=HEAD (long view: http://gitweb.thrift-rpc.org/?p=thrift.git;a=log;h=refs/heads/pri/dreiss/fb-merge-p1;hb=HEAD). It's almost all C++ library changes, with some other misc stuff sprinkled in. What do you guys think would be the best way of merging this stuff into Apache? I'd prefer not to create a separate issue for each C++ patch, especially since they've all been reviewed and production-tested internally. I can do it for the non-C++ stuff if you'd like. Would people be okay if I just create one big patch set for the C++ stuff, attach it here, and commit after a week if there are no objections?