Error when trying to Cherry Pick an already merged commit.

Joshua J. Kugler

unread,

Jul 18, 2014, 4:26:18 PM7/18/14

to Repo and Gerrit Discussion

Gerrit 2.8.5.

I am getting an error when a user tries to cherry pick a change to another
branch. In the Web UI I am getting "Code Review - Error" "Cherry pick failed"
and a "Continue" button. But nothing in the error_log. Anywhere I should look
to debug this?

j

--
Joshua J. Kugler - Fairbanks, Alaska
Azariah Enterprises - Programming and Website Design
jos...@azariah.com - Jabber: peda...@gmail.com
PGP Key: http://pgp.mit.edu/ ID 0x73B13B6A

Saša Živkov

unread,

Jul 18, 2014, 4:44:41 PM7/18/14

to Joshua J. Kugler, Repo and Gerrit Discussion

On Fri, Jul 18, 2014 at 10:26 PM, Joshua J. Kugler <jos...@azariah.com> wrote:

Gerrit 2.8.5.

I am getting an error when a user tries to cherry pick a change to another
branch. In the Web UI I am getting "Code Review - Error" "Cherry pick failed"
and a "Continue" button. But nothing in the error_log. Anywhere I should look
to debug this?

You could use the developer tools in Chrome or the firebug plugin in Firefox

to trace the HTTP requests/responses. Try to cherry-pick the change again

and then search for a reqeust like:

POST /changes/{change-id}/revisions/{revision-id}/cherrypick

and check what's the response for that request.

j

--
Joshua J. Kugler - Fairbanks, Alaska
Azariah Enterprises - Programming and Website Design
jos...@azariah.com - Jabber: peda...@gmail.com
PGP Key: http://pgp.mit.edu/ ID 0x73B13B6A

--
--
To unsubscribe, email repo-discuss...@googlegroups.com
More info at http://groups.google.com/group/repo-discuss?hl=en

---
You received this message because you are subscribed to the Google Groups "Repo and Gerrit Discussion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to repo-discuss...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

David Pursehouse

unread,

Jul 18, 2014, 7:43:58 PM7/18/14

to Joshua J. Kugler, repo-discuss

It can fail like this if:

- The resulting commit is empty, I.e. the change is already on the target branch.

- There was a conflict.

Unfortunately the way it is implemented doesn't distinguish between the two cases and you just get a "failed" message.

David Pursehouse

unread,

Jul 20, 2014, 8:38:31 AM7/20/14

to Joshua J. Kugler, repo-discuss

On Sat, Jul 19, 2014 at 8:43 AM, David Pursehouse <david.pu...@sonymobile.com> wrote:

It can fail like this if:

- The resulting commit is empty, I.e. the change is already on the target branch.

- There was a conflict.

Unfortunately the way it is implemented doesn't distinguish between the two cases and you just get a "failed" message.