Monorail Project: gerrit Issues People Development process History Sign in
New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.
Starred by 76 users
Status: Released
Owner: ----
Closed: Aug 2016
Cc:

Blocked on:
issue 194

Blocking:
issue 10



Sign in to add a comment
Show full merge diff on merge commits
Reported by code-rev...@gtempaccount.com, Sep 24 2009 Back to list
Reported by <danfuzz@android.com> on Wed Mar 18 17:51:10 PDT 2009
Source: JIRA GERRIT-106
Affected Version: 2.0.8

Instead of only showing the "diff --cc" output on a merge commit (which shows
only real conflicts) allow a way for the user to see "diff HEAD^1 HEAD", aka
the full diff introduced into the destination branch by the merge commit.

Maybe this should be a per-project or per-user setting?
Maybe this should be overridable when looking at a change, in case you want/
need to see the other view?
 
Comment by <danfuzz@android.com> on Thu Mar 19 10:08:00 PDT 2009

I would go for the latter suggestion: No setting, and have a button to switch
over to a "full diff" view. Thanks!
Comment 2 by s...@google.com, Sep 24 2009
Blockedon: 194
Status: Accepted
Comment 3 by s...@google.com, Sep 24 2009
Comment 4 by ern...@gmail.com, Oct 11 2010
I guess the original reason for the way Gerrit works is that a merge commit in git has two "equal" parents, which one do you want to diff? But in Gerrit there is a clear destination so showing the diff against that would be a lot more useful than what's shown now.
Comment 5 by di...@google.com, Oct 11 2010
Yeah, Gerrit changes usual Git workflow and little bit of concepts. GitWeb usually has the option to display diff against one parent or another.
Today I encountered a change where one file was conflicted (and thus available in gerrit) but the other file was merged. It would have been very easy to miss the fact that there were files in the change that were only visible in gitweb.

Perhaps until this is implemented (or issue 10) gerrit could call out the merged files by including them in the main file list?
Hello guys,
are there any plans to implement such a feature?
Project Member Comment 8 by edwin.ke...@gmail.com, Aug 19 2013
Status: ChangeUnderReview
Yes, it is actually already being implemented:
  https://gerrit-review.googlesource.com/33960
Sorry for bothering with a questions :) but are there any plans to include this feature in 2.8 release? I see some progress on it but it is really slow.

Many thanks!
No, this feature will not be in 2.8 or 2.8.1

Comment 11 by ach...@quikr.com, Jul 3 2015
Hi all,
Is there any update on this issue? A lot of requirements come from my company where they want the full merge commit to be reviewed (something on the lines of Github)
Please suggest
Project Member Comment 12 by edwin.ke...@gmail.com, Jul 3 2015
> Is there any update on this issue?
No :-(
Comment 13 by org...@gmail.com, Jul 9 2015
Can you please prioritize this? I'd try to solve it myself (even pushed a preliminary patch here: https://gerrit-review.googlesource.com/58716), but my Java skills are limited, and I'm not familiar at all with JGit.
Solution proposed in https://gerrit-review.googlesource.com/33960 is based on wrong assumtions. You don't need a diff against a common ancestor here - it is too complicated (e.g. merge can have many common ancestors). You just need a diff between merge's HEAD and HEAD^1.
Please look into https://gerrit-review.googlesource.com/#/c/72092/ and share your comments with me.
Labels: FixedIn-2.13
Status: Submitted
Project Member Comment 16 by huga...@gmail.com, Sep 22 2016
Status: Released
Sign in to add a comment