You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@thrift.apache.org by "David Reiss (JIRA)" <ji...@apache.org> on 2009/12/18 20:08:20 UTC

[jira] Created: (THRIFT-654) What is the best way to merge a bunch of code from Facebook?

What is the best way to merge a bunch of code from Facebook?
------------------------------------------------------------

                 Key: THRIFT-654
                 URL: https://issues.apache.org/jira/browse/THRIFT-654
             Project: Thrift
          Issue Type: Question
          Components: Compiler (General), Library (C++), Library (Java), Library (Python)
            Reporter: David Reiss


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?

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (THRIFT-654) What is the best way to merge a bunch of code from Facebook?

Posted by "Bryan Duxbury (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/THRIFT-654?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12792594#action_12792594 ] 

Bryan Duxbury commented on THRIFT-654:
--------------------------------------

I would think that at the very least you should summarize what changes you're making so that interested reviewers know what they're scanning.

> What is the best way to merge a bunch of code from Facebook?
> ------------------------------------------------------------
>
>                 Key: THRIFT-654
>                 URL: https://issues.apache.org/jira/browse/THRIFT-654
>             Project: Thrift
>          Issue Type: Question
>          Components: Compiler (General), Library (C++), Library (Java), Library (Python)
>            Reporter: David Reiss
>
> 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?

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (THRIFT-654) What is the best way to merge a bunch of code from Facebook?

Posted by "Bryan Duxbury (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/THRIFT-654?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12842911#action_12842911 ] 

Bryan Duxbury commented on THRIFT-654:
--------------------------------------

Are you still waiting to merge in these changes?

> What is the best way to merge a bunch of code from Facebook?
> ------------------------------------------------------------
>
>                 Key: THRIFT-654
>                 URL: https://issues.apache.org/jira/browse/THRIFT-654
>             Project: Thrift
>          Issue Type: Question
>          Components: Compiler (General), Library (C++), Library (Java), Library (Python)
>            Reporter: David Reiss
>
> 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?

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Closed: (THRIFT-654) What is the best way to merge a bunch of code from Facebook?

Posted by "Bryan Duxbury (JIRA)" <ji...@apache.org>.
     [ https://issues.apache.org/jira/browse/THRIFT-654?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Bryan Duxbury closed THRIFT-654.
--------------------------------

         Assignee: David Reiss
    Fix Version/s: 0.4
       Resolution: Fixed

I'm assuming this has actually been done by now. If that's incorrect, please do it and retag the issue as 0.5.

> What is the best way to merge a bunch of code from Facebook?
> ------------------------------------------------------------
>
>                 Key: THRIFT-654
>                 URL: https://issues.apache.org/jira/browse/THRIFT-654
>             Project: Thrift
>          Issue Type: Question
>          Components: C++ - Library, Compiler (General), Java - Library, Python - Library
>            Reporter: David Reiss
>            Assignee: David Reiss
>             Fix For: 0.4
>
>
> 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?

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (THRIFT-654) What is the best way to merge a bunch of code from Facebook?

Posted by "David Reiss (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/THRIFT-654?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12842912#action_12842912 ] 

David Reiss commented on THRIFT-654:
------------------------------------

Yeah.  I just asked if anyone cared if I commit THRIFT-665.  I was going to check them all in tonight (the others are approved or trivial).

> What is the best way to merge a bunch of code from Facebook?
> ------------------------------------------------------------
>
>                 Key: THRIFT-654
>                 URL: https://issues.apache.org/jira/browse/THRIFT-654
>             Project: Thrift
>          Issue Type: Question
>          Components: Compiler (General), Library (C++), Library (Java), Library (Python)
>            Reporter: David Reiss
>
> 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?

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (THRIFT-654) What is the best way to merge a bunch of code from Facebook?

Posted by "David Reiss (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/THRIFT-654?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12792621#action_12792621 ] 

David Reiss commented on THRIFT-654:
------------------------------------

Okay.  I've created individual issues for everything that isn't C++.  I'll create a single issue with a summary of the C++ stuff and we'll see how it looks.

> What is the best way to merge a bunch of code from Facebook?
> ------------------------------------------------------------
>
>                 Key: THRIFT-654
>                 URL: https://issues.apache.org/jira/browse/THRIFT-654
>             Project: Thrift
>          Issue Type: Question
>          Components: Compiler (General), Library (C++), Library (Java), Library (Python)
>            Reporter: David Reiss
>
> 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?

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.


[jira] Commented: (THRIFT-654) What is the best way to merge a bunch of code from Facebook?

Posted by "Todd Lipcon (JIRA)" <ji...@apache.org>.
    [ https://issues.apache.org/jira/browse/THRIFT-654?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12792588#action_12792588 ] 

Todd Lipcon commented on THRIFT-654:
------------------------------------

Is it possible to rebase -i them into a smaller number of cohesive patches? I'd be fine reviewing a single JIRA of "Miscellaneous bug fixes for python", but I don't think multiple new features should be conflated into the same JIRA.

> What is the best way to merge a bunch of code from Facebook?
> ------------------------------------------------------------
>
>                 Key: THRIFT-654
>                 URL: https://issues.apache.org/jira/browse/THRIFT-654
>             Project: Thrift
>          Issue Type: Question
>          Components: Compiler (General), Library (C++), Library (Java), Library (Python)
>            Reporter: David Reiss
>
> 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?

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.