Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [cross-project-issues-dev] Reminder that Sim. Rel. build input Git repo is now "under Gerrit"

There is a new option in Gerrit that is like "Cherry Pick" but a bit better called "Rebase if necessary".  It basically allows to avoid merges but also keep track of patchset dependencies, unlike the "Cherry pick" option which ignores any patchset dependencies and can sometimes cause problems.

From: cross-project-issues-dev-bounces@xxxxxxxxxxx [cross-project-issues-dev-bounces@xxxxxxxxxxx] on behalf of LETAVERNIER Camille [Camille.LETAVERNIER@xxxxxx]
Sent: May 27, 2015 11:47 AM
To: Cross project issues
Subject: Re: [cross-project-issues-dev] Reminder that Sim. Rel. build input Git repo is now "under Gerrit"

Hi all,


The policy on simrel is to only accept “Fast forward” commits. However, Gerrit is configured to “merge” contributions, thus rejecting changes if another commit has been pushed during the validation build [1].

Would it make sense to configure Gerrit to “Cherry pick if necessary” instead of “Merge”?


[1] Example:





De : cross-project-issues-dev-bounces@xxxxxxxxxxx [mailto:cross-project-issues-dev-bounces@xxxxxxxxxxx] De la part de David M Williams
Envoyé : mardi 26 mai 2015 17:15
À : cross-project-issues-dev@xxxxxxxxxxx
Objet : [cross-project-issues-dev] Reminder that Sim. Rel. build input Git repo is now "under Gerrit"


I have had a few questions on this lately about "why can't I push to .../gitroot/" ... and the answer is that now we've moved to use Gerrit to "push changes".

Basics are described in

and if you are new to Gerrit, you might find some of the comments in this cross-project thread helpful.
(I'd like to turn that into a FAQ someday ... lots of good info in that complete thread, including alternative approaches, etc.).

And, before "new to Gerrit" people panic, this does not mean you *have* to use Gerrit Review to get your changes in, but, you do need to change your "push URL".
master-->master still goes "straight to Git repo".
master-->refs/for/master goes to Gerrit for "test build" and Review and must be explicitly "submitted" to get merged to the master branch.


Back to the top