My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
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
Status:  Released
Owner:  ----
Closed:  Feb 2015


Sign in to add a comment
 
Project Member Reported by david.pu...@sonymobile.com, Feb 17, 2015
*****************************************************************
*****                                                       *****
***** !!!! 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.

Feb 19, 2015
Project Member #1 david.pu...@sonymobile.com
https://gerrit-review.googlesource.com/#/c/64861/
Status: Submitted
Labels: FixedIn-2.11
Apr 16, 2015
Project Member #2 david.pu...@sonymobile.com
(No comment was entered for this change.)
Status: Released
Sign in to add a comment

Powered by Google Project Hosting