| Issue 3184: | SubmitWholeTopic: Fails if one of the changes results in "already merged" with cherry-pick strategy | |
| 1 person starred this issue and may be notified of changes. | Back to list |
***************************************************************** ***** ***** ***** !!!! THIS BUG TRACKER IS FOR GERRIT CODE REVIEW !!!! ***** ***** ***** ***** DO NOT SUBMIT BUGS FOR CHROME, ANDROID, CYANOGENMOD, ***** ***** INTERNAL ISSUES WITH YOUR COMPANY'S GERRIT SETUP, ETC.***** ***** ***** ***** THOSE ISSUES BELONG IN DIFFERENT ISSUE TRACKERS ***** ***** ***** ***************************************************************** Affected Version: master What steps will reproduce the problem? 1. Enable "submitWholeTopic" 2. Set project merge strategy to "cherry pick" 3. Push three changes: Change 1: has some content Change 2: is empty (i.e. `git commit --allow-empty`) Change 3: has some content 4. Approve/verify all 3 changes 5. Press "Submit whole topic" What is the expected output? What do you see instead? Expected: all changes to be merged. Actual: NPE in the cherrypick merge strategy. Please provide any additional information below.
Apr 16, 2015
(No comment was entered for this change.)
Status:
Released
|
|
| ► Sign in to add a comment |
Labels: FixedIn-2.11