Re: [mdt-papyrus.dev] Gerrit Submitted, Merge Pending

["Christian W. Damus" <give.a.damus@xxxxxxxxx>]

Hi, Benoit, all,

So, I just had this happen to me with a review that I cherry-picked from the Mars maintenance branch:  https://git.eclipse.org/r/#/c/51408/

The original change on the Mars maintenance branch (51276) was merged immediately when I submitted it.  That was on the Mars branch, of course.  The cherry-pick as 51408, however, got stuck in the “merge pending” state when I submitted it.

So, I pulled down the change, cherry-picked it onto master locally, and pushed that to effect the merge myself.  The result was that, yes, the 51408 review is now closed as merged *but* this also resulted in a second patch set being created and a Gerrit build triggered on that new patch set.  I *did not* push anything to refs/for/master; AFAIK, no new patch set should have been created.  All I did was push my local master to the remote master (albeit through Gerrit).

Something fishy is going on.  Perhaps the master branch in Gerrit is stuck with a queue of pending merges behind one that, if it were unblocked, would just let everything else go through so we could return to normal?  I have no idea.  In any case, have we called in the Webmaster yet to help us get unstuck?  I suspect that every new Gerrit contribution to master is going to get stuck …

Cheers,

Christian

On Fri, Jul 3, 2015 at 8:23 AM, MAGGI Benoit <Benoit.MAGGI@xxxxxx> wrote:

Hi,

 

So what contribution is required for 1 ?

 

Benoit

 

1 : https://git.eclipse.org/r/#/c/50262/

 

De : mdt-papyrus.dev-bounces@xxxxxxxxxxx [mailto:mdt-papyrus.dev-bounces@xxxxxxxxxxx] De la part de LETAVERNIER Camille
Envoyé : vendredi 3 juillet 2015 10:36
À : Papyrus Project list
Objet : [PROVENANCE INTERNET] Re: [mdt-papyrus.dev] Gerrit Submitted, Merge Pending

 

Hi,

 

The “submitted” status means that contribution B has been accepted, but it depends on a contribution A that has not yet been accepted.

Dependencies need to be reviewed and submitted, then Gerrit will automatically merge the dependents (Or “cherry pick” them)

 

Camille

 

De : mdt-papyrus.dev-bounces@xxxxxxxxxxx [mailto:mdt-papyrus.dev-bounces@xxxxxxxxxxx] De la part de MAGGI Benoit
Envoyé : vendredi 3 juillet 2015 09:31
À : Papyrus Project list
Objet : [PROVENANCE INTERNET] [mdt-papyrus.dev] Gerrit Submitted, Merge Pending

 

Hi Team,

 

There are some contribution stuck in merging (see 1)

The oldest was merged 23 hours ago (see 2).

 

Has anyone an idea of what is going on ?

All referenced bug I found on Gerrit with this kind of comportment are on older version.

It suppose that something went wrong on the server side. Can we acces the logs ?

Or do we need to open a community bug ?

 

Regards,

Benoit

 

1 : https://git.eclipse.org/r/#/q/project:papyrus/org.eclipse.papyrus+status:submitted

2 : https://git.eclipse.org/r/#/c/50262/