Cherry-pick" creates duplicate requests

Mk

unread,

Aug 30, 2021, 3:09:48 AM8/30/21

to Repo and Gerrit Discussion

We are using Gerrit - 3.2.3 and currently we are encountering problem with "Cherry-pick" duplicate requests.

Scenario as follows.

1) Pushed a patch-set to gerrit "release" branch.
2) From "release" branch on Gerrit GUI clicked "Cherry-Pick" option.
3) Selected "Master" branch in "Cherry-pick" option and clicked Ok.
4) Cherry-pick finished successfully and able to see request in Dashboard list.

Both the requests are in review state. Again if I re-do the same above given four steps, still it creates duplicate, ideally it should not create if I'm right. Is it something bug?

Björn Pedersen

unread,

Aug 30, 2021, 3:21:38 AM8/30/21

to Repo and Gerrit Discussion

Mk schrieb am Montag, 30. August 2021 um 09:09:48 UTC+2:

We are using Gerrit - 3.2.3 and currently we are encountering problem with "Cherry-pick" duplicate requests.

Scenario as follows.
1) Pushed a patch-set to gerrit "release" branch.
2) From "release" branch on Gerrit GUI clicked "Cherry-Pick" option.
3) Selected "Master" branch in "Cherry-pick" option and clicked Ok.
4) Cherry-pick finished successfully and able to see request in Dashboard list.
Both the requests are in review state.

This expected ( a cherry-pick is a new change that requries review on the respective branch.)

Again if I re-do the same above given four steps, still it creates duplicate, ideally it should not create if I'm right. Is it something bug?

Only if this happens after the first one has been submitted(merged). The the cherry-pick should be empty.

Otherwise it is the same behavior as if different people ( or the same in different checkouts) did this cherry-pick locally and push it for review.

Björn

Sven Selberg

unread,

Aug 30, 2021, 3:30:18 AM8/30/21

to Repo and Gerrit Discussion

Isn't the issue that you now have two identical changes. Same project, same target-branch, same Change-Id footer.

Seems like a bug to me.

Björn

Mk

unread,

Aug 30, 2021, 3:47:56 AM8/30/21

to Repo and Gerrit Discussion

If again i perform Cherry-Pick for the patch-set already cherry-picked, reviewed and submitted getting below message (this is expected).

Cherry Pick Conflict!
Cherry Pick failed! (merge conflicts) Please select "Continue" to continue with conflicts or select "cancel" to close the dialog

Mohan

unread,

Aug 30, 2021, 11:13:50 AM8/30/21

to Repo and Gerrit Discussion

Hello Bjorn,

Until my "from patch-set" request gets merged/submitted i should be able to perform multiple(duplicate) cherry-picks?

--
--
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 a topic in the Google Groups "Repo and Gerrit Discussion" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/repo-discuss/jcpbV70hfVo/unsubscribe.
To unsubscribe from this group and all its topics, send an email to repo-discuss...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/repo-discuss/7449b2f1-6c2c-48c1-997c-3234e1c3f6b9n%40googlegroups.com.

Reply all

Reply to author

Forward