My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 665: Merge diff not showing for conflicts
15 people starred this issue and may be notified of changes. Back to list
Status:  Submitted
Owner:  ----
Closed:  Jun 2011


Sign in to add a comment
 
Reported by di...@google.com, Aug 18, 2010
Affected Version: 2.1.4

What steps will reproduce the problem?
1. Create a merge commit with resolved conflicts
2. Push it for code review
3. Try to click on the diff buttons on the change page

What is the expected output? What do you see instead?
Should show some kind of diff. It doesn't do anything.

Aug 18, 2010
#1 sop@google.com
This is a regression that was introduced in 2.1.4.
Status: Accepted
Labels: -Priority-Minor Priority-Major Milestone-2.1.5
Aug 23, 2010
#2 sop@google.com
(No comment was entered for this change.)
Labels: -Milestone-2.1.5 Milestone-2.1.6
Dec 8, 2010
#3 di...@google.com
So this was fixed in the (just released) 2.1.6? Did not see it in the release notes.
Dec 28, 2010
#4 srom...@gmail.com
Version 2.1.6-rc1 also seems affected
Apr 16, 2011
#5 di...@google.com
Any progress on this issue for 2.1.7? It's already a long standing regression (since 2.1.4).
May 19, 2011
#6 sop@google.com
(No comment was entered for this change.)
Labels: -Milestone-2.1.6
Jun 24, 2011
#7 razv...@google.com
This bug is still present in 2.2.1.
Jun 24, 2011
#8 sop@google.com
Of course its still present, we haven't fixed it. :-)

I'm actually trying to work on it today. Hopefully I can finish it this afternoon.
Status: Started
Jun 24, 2011
#9 di...@google.com
Hmm... you're really making me want to update to 2.2.x :)
Jun 24, 2011
#10 sop@google.com
I've hacked merges by having the server produce the automatic merge result of the parents, and then diff the actual merge result against the automatic one. A screenshot is attached showing a conflict in Gerrit Code Review's own history.
example_conflict.png
72.5 KB   View   Download
Jun 27, 2011
#12 sop@google.com
(No comment was entered for this change.)
Status: Submitted
Labels: FixedIn-2.2.2
Oct 25, 2011
#13 lezhi.z...@gmail.com
Hello, May I know when is the 2.2.2 targeted to roll out?
thanks!
Sep 10, 2012
#14 sebastie...@intersec-group.com
Hello,

*What steps will reproduce the problem?*
Same steps (I'm merging a branch that is managed by gerrit).

*What is the expected output? What do you see instead?*
I'm currently using version 2.3 and when I push merge commit to gerrit, I can observe two different behaviors:
* As expected, the change page shows the conflict resolution only
* The change page shows the whole merge diff (that is impossible to review: way too big)

Do you know why this second kind of behavior can happen?

Thanks
Sign in to add a comment

Powered by Google Project Hosting