My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 1283: Files Missing from Merge commit
1 person starred this issue and may be notified of changes. Back to list
Status:  WontFix
Owner:  ----
Closed:  Mar 2012


Sign in to add a comment
 
Reported by b...@abhr.co.uk, Mar 5, 2012
Affected Version: 2.2.1

What steps will reproduce the problem?
1.Create Branch Fred from master
2.Commit Changes to Fred and master
3.Merge from master into Fred
4.Push merge into Gerrit for review

What is the expected output?
Files changed as part of merge visible for review in Gerrit

What do you see instead?
Only the commit message is visible in Gerrit despite the fact that multiple files are listed in the Git commit as being modified

Please provide any additional information below.
Mar 5, 2012
Project Member #1 bklarson@gmail.com
This is the desired behavior.  Gerrit only shows the difference between the automerge results and the proposed merge commit.  If there are no merge conflicts, there is nothing to show.

I'm working on a feature which will allow the user to diff all changes made to the feature branch when it is merged back in to master, but the behavior you describe is currently as-designed.
Status: WontFix
Mar 6, 2012
#2 b...@abhr.co.uk
Hi,
thanks for that, can you also confirm that if a conflict is resolved by selecting the file on the destination branch that is also not expected to show?
Cheers
Sign in to add a comment

Powered by Google Project Hosting