| Issue 2129: | Submit-type cherry-pick broken with enabled "Can merge" feature | |
| 1 person starred this issue and may be notified of changes. | Back to list |
************************************************************ ***** NOTE: THIS BUG TRACKER IS FOR GERRIT CODE REVIEW ***** ***** DO NOT SUBMIT BUGS FOR CHROME, ANDROID, INTERNAL ***** ***** ISSUES WITH YOUR COMPANY'S GERRIT SETUP, ETC. ***** ***** THOSE ISSUE BELONG IN DIFFERENT ISSUE TRACKERS! ***** ************************************************************ Affected Version: What steps will reproduce the problem? 1. Set submit-type for your project to "cherry-pick" 2. Enable the "Can merge" feature 3. Try to submit a change with pending dependency or based on outdated patchset What is the expected output? What do you see instead? Expected: Change can be merged. According to the docu [1], this is what should happen: "Cherry Pick - Always cherry pick the patch set, ignoring the parent lineage and instead creating a brand new commit on top of the current branch head." Actual: "Can merge: no - requires rebase or has dependency". I actually have to press the rebase button or need to submit the dependencies first. This is not how it was without the "Can merge" feature. Maybe I don't understand the documentation correctly, but this doesn't seem to be right. [1] https://gerrit-review.googlesource.com/Documentation/project-setup.html
Sep 17, 2013
#1
voel...@gmail.com
Sep 24, 2013
Actually this Gerrit instance is 2.5 with some commits cherry-picked from 2.6. I tried the described scenario with the "Can merge" feature enabled with both Gerrit 2.5 and current master (aka 2.8) and in both cases I could submit a change which has a pending dependency or which was based on an outdated patch set and the cherry-pick was successfully done. Please note that if you have two open changes A and B, where B depends on A, you can only cherry-pick B if: 1. B does not touch any file that was touched by A 2. All files touched by B that were also touched by A can be automatically merged AND 'Automatically resolve conflicts' is enabled on the project Otherwise it is correct that you get "Can merge: no - requires rebase or has dependency" for B. Can you please check, if in your case B contains files from A and if yes, if the modifications allow an automatic content merge and that 'Automatically resolve conflicts' is enabled on the project?
Status:
AwaitingInformation
Sep 24, 2013
By the way, clicking on the "Rebase" button may help because in this case Gerrit always tries to do a content merge even if 'Automatically resolve conflicts' is not enabled on the project.
Dec 6, 2013
After updating to gerrit-2.7 the problem seems have vanished. Thanks!
Dec 6, 2013
(No comment was entered for this change.)
Status:
CannotReproduce
|
|
| ► Sign in to add a comment |