+govind as I am not terribly familiar with the usage of drover

If the CL is already in place, it may be that this behavior is expected, it is strange that it throws errors with 'Gerrit' in there, the browser side does not seem to be using Gerrit. 

This looks like it might be a duplicate of https://bugs.chromium.org/p/chromium/issues/detail?id=633988 as well, perhaps there was an infra problem?

+phobbs whom is on another similar sounding bug.

+ dimu@

+ git admin

Yes, this was successfully picked as https://chromium.googlesource.com/chromium/src/+/3b634e681fa646a84ef38ebe7d5aee3608ce8309

All git commits in chromium/src go through gerrit (though we do no use gerrit for code review, we do use it for access-control), which is the reason that appears in the error message.

I believe the original error was caused by a flake in the backend where even though it accepted the change, it failed to terminate the network connection properly.

Relabeling this bug as DX to clean up the messaging in the tool.

Hm, I think this similar to another report at the same time, for which I filed internal bug b/30924463.

Robbie, can you clarify what messaging change you had in mind? To me the only fix would actually require determining that a change has *just* landed onto destination branch before retrying git push, which is more of a logic change than messaging.

 Issue 633988  has been merged into this issue.

 Issue 618084  has been merged into this issue.

that's what I meant :) Basically instead of terminating with `[rejected] (non-fast-forward)` it would actually look for the commit.

However, I think once you move gnumbd -> gerrit, this issue is moot, since there's no more pending/regular refs, so no need to wait; just rebase w/ number and push. If push succeeds, you're done.

Yep, agree.

I got a similar error 13 hours ago. git-cl complains about a merge conflict in (blank spot).
The CL is open: https://codereview.chromium.org/2261043002
But the patch seems to have landed at branch-heads/2785: https://chromium.googlesource.com/chromium/src.git/+log/branch-heads/2785 (at a58871cac6284a5167c1cf039127d270c8a6fb8b), and bugdroid visited the issue: https://bugs.chromium.org/p/chromium/issues/detail?id=633963#c22


Fetching pending ref refs/pending/branch-heads/2785...
Cherry-picking commit on top of pending ref...
Pushing commit to refs/pending/branch-heads/2785... It can take a while.
Push failed with exit code 1.
To https://chromium.googlesource.com/chromium/src.git
!       HEAD:refs/pending/branch-heads/2785     [remote rejected] (error in Gerrit backend)
Done
Retrying, 1 attempts left...
Fetching pending ref refs/pending/branch-heads/2785...
Cherry-picking commit on top of pending ref...
Pushing commit to refs/pending/branch-heads/2785... It can take a while.
Push failed with exit code 1.
To https://chromium.googlesource.com/chromium/src.git
!       HEAD:refs/pending/branch-heads/2785     [rejected] (non-fast-forward)
Done
Retrying, 0 attempts left...
Fetching pending ref refs/pending/branch-heads/2785...
Cherry-picking commit on top of pending ref...
Your patch doesn't apply cleanly to ref 'refs/pending/branch-heads/2785', the following files have merge conflicts:

Please rebase your patch and try again.
Failed to push. If this persists, please file a bug.
Error: Command 'cl land --bypass-hooks' failed: Command '['git', 'cl', 'land', '--bypass-hooks']' returned non-zero exit status 1

Still got error today:
error: failed to push some refs to 'https://chromium.googlesource.com/chromium/src.git'
ERROR:git-retry:Process failure was not known to be transient; terminating with return code 1
Push failed with exit code 1.
To https://chromium.googlesource.com/chromium/src.git
!	HEAD:refs/pending/branch-heads/2883	[remote rejected] (prohibited by Gerrit)
Done

I don't know about other developers. But my merging failed completely. This has been a problem for a quarter, and needs to be fixed immediately.

I've just had to do a merge for a colleague that cannot merge themselves. This is now the 5th (!) time. As this is affecting multiple (hundreds?) of developers, this is really a P0 issue. Please start work ASAP.

govind: Would you happen to know of an appropriate owner for this issue?

+ amineer@, may be he can help to assign this bug to right owner.

Infra needs to make an assignment, not me.

I came across the same issue. The end of an error message I got is exactly like that in comment 12. That is, it complains about 'files with merge conflicts', but there's no file actually list.  It happened with my git drover run for 
 bug 673971  comment 27 (https://bugs.chromium.org/p/chromium/issues/detail?id=673971#c27 ). Cherry-pick was successful nonetheless. 

-----------
Your patch doesn't apply cleanly to ref 'refs/pending/branch-heads/2924', the following files have merge conflicts:

Please rebase your patch and try again.
Failed to push. If this persists, please file a bug.
Error: Command 'cl land --bypass-hooks' failed: Command '['git', 'cl', 'land', '--bypass-hooks']' returned non-zero exit status 1
--------------

This has been listed as untriaged for over two weeks. Marking available.

Since the priority is P-1, dropping it.

If you disagree with either of these actions (bulk edit), please fix.

This issue has been Available for over a year. If it's no longer important or seems unlikely to be fixed, please consider closing it out. If it is important, please re-triage the issue.

Sorry for the inconvenience if the bug really should have been left as Available. If you change it back, also remove the "Hotlist-Recharge-Cold" label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

No longer on the Chrome team, e-mail me @google.com if any attention still required from me here, otherwise good luck!