[asterisk-dev] Team branches and gerrit

[Russell Bryant]

On Fri, Apr 24, 2015 at 12:17 PM, Matthew Jordan <mjordan at digium.com> wrote:

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


That's right, but it should also track that they are related and in a
particular order.

https://gerrit.asterisk.org/#/c/255
https://gerrit.asterisk.org/#/c/256

See the "Related Changes" bit.  It shows the patches in order.

-- 
Russell Bryant
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20150424/9b099bd1/attachment.html>