My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 3052: Empty set of conflicting changes for merge commits
5 people starred this issue and may be notified of changes. Back to list
Status:  Submitted
Owner:  ----
Closed:  Oct 14


Sign in to add a comment
 
Project Member Reported by ziv...@gmail.com, Dec 10, 2014
************************************************************
***** 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:
all

What steps will reproduce the problem?
1. create a "feature" branch in Gerrit
2. change file A in the feature branch
3. change file A also in the master and push the change C1 for review, keep it open
4. merge "feature" into "master" and push the merge commit for review for the master, change C2
5. In the UI check the conflicting changes for the change C1

What is the expected output? What do you see instead?
C2 doesn't appear in the list of conflicting changes of C1 but it should


Please provide any additional information below.

Oct 14, 2015
Project Member #1 David.Os...@gmail.com
(No comment was entered for this change.)
Status: Accepted
Oct 14, 2015
Project Member #3 huga...@gmail.com
(No comment was entered for this change.)
Status: ChangeUnderReview
Oct 14, 2015
Project Member #4 david.pu...@sonymobile.com
(No comment was entered for this change.)
Status: Submitted
Labels: FixedIn-2.11.4
Sign in to add a comment

Powered by Google Project Hosting