[asterisk-dev] Team branches and gerrit

Matthew Jordan mjordan at digium.com
Fri Apr 24 11:17:30 CDT 2015


On Fri, Apr 24, 2015 at 8:42 AM, Russell Bryant
<russell at russellbryant.net> wrote:
> On Fri, Apr 24, 2015 at 8:31 AM, Joshua Colp <jcolp at digium.com> wrote:
>>
>> Olle E. Johansson wrote:
>>>
>>> Playing around following Matt's wiki page on gerrit usage, I created
>>> a team branch and did two commits. When pushing it with "git review
>>> {branch}" only the last commit shows up.
>>>
>>> Is that the way it's supposed to be? I thought the whole branch was
>>> the review subject, not just a single commit.
>>
>>
>> Gerrit works on a single commit (what it refers to as a patch set) that
>> you want included into a specific branch. As a result you need to squash all
>> commits into a single one, and if review feedback warrants further changes
>> they also need to be squashed back into a single commit with the original
>> changes. The single commit you post for review is what is reviewed and
>> merged into the branch.
>
>
> Gerrit can also work on a patch series, and tracks dependencies between
> those patches.
>

I could be mistaken, but in the case where you have a series of
patches, each patch is put up for review separately with its own
Change-Id, correct?

-- 
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



More information about the asterisk-dev mailing list