[asterisk-dev] Git Migration update

[Matthew Jordan]

On Sun, Apr 12, 2015 at 1:57 AM, George Joseph
<george.joseph at fairview5.com> wrote:
>
>
> On Sat, Apr 11, 2015 at 10:15 PM, Matthew Jordan <mjordan at digium.com> wrote:
>>
>
> I'm wondering if we can do this...
>
> You submit a review on the lowest target branch, using 13 as an example.
> The review gets reviewed and merged into 13.  Once the review is closed
> gerrit won't allow a cherry-pick but git of course has no problems with it.
> So maybe we can write/obtain a hook/plugin that allows the submitter to
> cherry-pick the change directly into the target branch, say master,
> bypassing the review process, assuming a clean merge.
>
> Alternative...  We normally don't have access to commit to refs/head
> directly but what if we had a hook that allowed a commit to be merged
> directly IF the commit-id/change-id matched a review already approved and
> merged to the original branch.

As an update to everyone:

For *right now*, we are going to try cherry-picking the changes to the
affected branches when the change is first up for review. This is
clearly a pretty big change in process, as the act of merging into
other branches was (a) always done by those with commit access and (b)
never reviewed. There's at least two good reasons to give this a try:

(1) There isn't anyone with "commit" access. Anyone can post a review
up to Gerrit. The plus side is that there are far fewer barriers to
getting a patch into Asterisk. The downside is that there isn't a
select group of people who have been trusted to do the merges. The
only way to ensure that patches actually do get merged into all the
branches is to require people to put the patches up with the initial
review.

(2) Gerrit really, really wants to review things. That's a good thing:
we've had plenty of bad merges take out branches in the past - either
from compilation issues, subtle bugs that creep in due to API
compatibility problems, etc. We've had even more that get merged
upstream and fail to take advantage of APIs that exist in later
versions of Asterisk. Reviews will help to catch that.

This is a trial. We'll re-evaluate how things are working at the end
of the week.

Instructions for cherry-picking changes are on a draft wiki page here:

https://wiki.asterisk.org/wiki/display/AST/Git+Usage

-- 
Matthew Jordan
Digium, Inc. | Director of Technology
445 Jan Davis Drive NW - Huntsville, AL 35806 - USA
Check us out at: http://digium.com & http://asterisk.org