Gerrit Change has Status:Submitted, Merge Pending, how to solve it?

Question

The Gerrit system is only used by us several people. Once there is a Change A, and its status is: "Submitted, Merge Pending". The change list in the "open" web page. Also I noticed this Change had a dependency on another change B (which status is abandoned).

1. How to make A listed on "Merged" web page ?
2. How to make B disappear, so A has no more dependency on B ?

Ageless

I've asked similar question and got a bit more detailed (useful for newbie) answers. – Beaverboard

Answer 1

If change A has a dependency on B, then A cannot be merged until B is merged. Since you have abandoned B, Gerrit will not automatically merge A.

What you will need to do is modify A (perhaps using git rebase) so that it no longer depends on B, and resubmit the change to Gerrit.

Obeisance

Then how to make B disappeare from web page ? – Ageless

You've already abandoned B. What else do you want to do with it? – Obeisance

@GregHewgill I think what he meant was how to delete change B entry from Gerrit as if it never existed(so it does not show on Gerrit Web UI anywhere). I don't think it is possible from Gerrit Web UI as there is a Restore Change button on Abandoned change items which lets you bring a change back from abandoned state. If one still wanted to delete they could do so manually from backend(although I never tried it) – Busload

Suggestion: Try a rebase origin/branch by the pending commit owner. – Suite

Answer 2

FYI. I had the same problem of "Submitted, Merge Pending" when user press submit twice on same page (she double clicked the submit button). It happened in Gerrit 2.11.

Error in log looks like

Caused by: com.mysql.jdbc.exceptions.jdbc4.MySQLIntegrityConstraintViolationException:     Duplicate entry '5173-2-1' for key 'PRIMARY'
    at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
    at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57)

Before submitting there was only 1 commit (code changes). But after double pressing there are 2 commits. Second one is with new Commit Message and "Submitted, Merge Pending" status.

When I removed all information about second commit:

$ ssh -p 29418 admin@machine gerrit gsql
gerrit> delete from `patch_set_approvals` where change_id=5173 and patch_set_id=2;
gerrit> delete from `patch_set_ancestors` where change_id=5173 and patch_set_id=2;
gerrit> delete from `patch_sets` where change_id=5173 and patch_set_id=2;

it marked as integrated by user Gerrit Code Review .

Goldshlag

Answer 3

What Greg states is correct, an automatic merge is not possible. It is possible to incorporate just A by using Gerrit's "cherry pick" option (essentially a manual merge). Unfortunately, this will not remove the "Merge Pending" status of Gerrit. I usually write a comment to this effect, if the Contributor cannot be troubled to rebase.

Biologist

Answer 4

1. Abandon your push from Gerrit.

On Terminal:

2. git log
3. git reset HEAD~n

where n is the commit count from top in list of commits generated on terminal from step 2

4. git add .
5. git commit -m "Your message"
6. git push

now merge your commit on Gerrit.

Donyadoodad

Answer 5

Guy. If you commit has a tag, you may meet a bug. This bug had been fixed in Gerrit V2.7.

Bug reference: https://groups.google.com/forum/#!topic/repo-discuss/tLVMibfzroc

Frau

Answer 6

I had the same problem of "Submitted, Merge Pending" without any dependency or conflict. Quick fix is to go through all open items and see if there is any other commit in "Submitted, Merge Pending" status. If yes, just abandon them all.

Then git commit --amend -m "your original comments" and git push again, this time you can have your fix merged.

Stratopause

Answer 7

I faced this issue because I pushed a tag to branch name:

git tag x.y.z HEAD
git push -f origin x.y.z:master

So better push a branch instead,

git tag x.y.z HEAD
git push -f origin HEAD:master

That way gerrit is able to merge again my pending patches.

Anecdote