Issue 219: Diff got confused
Status:  Released
Owner:
Closed:  Oct 2012
Reported by code-rev...@gtempaccount.com, Sep 24, 2009
Reported by <danfuzz@android.com> on Mon Jun 15 21:01:52 PDT 2009
Source: JIRA GERRIT-220
Affected Version: 2.0.14
Environment: n/a

I tried viewing side-by-side diffs for the one file in Android-internal change
#4291. When diffing the base against patch set 2 it looks right, but it looks
wrong when patch sets 1 and 2 are compared.

In particular, it incorrectly shows a line as being duplicated (953) and,
later, a line being deleted (958); the intervening lines match up with the
first patch set except the line numbers are off. See attached image.
weird-diff.png
75.9 KB   View   Download
Sep 24, 2009
#1 code-rev...@gtempaccount.com
Comment by Shawn Pearce <sop@google.com> on Tue Jun 16 08:19:38 PDT 2009

Fixed by https://review.source.android.com/10434
Sep 24, 2009
#2 code-rev...@gtempaccount.com
Update by Shawn Pearce <sop@google.com> on Tue Jun 16 08:19:38 PDT 2009

Fixed in version 2.0.14.1.
Status: Fixed
Sep 25, 2009
#3 code-rev...@gtempaccount.com
(No comment was entered for this change.)
Labels: FixedIn-2.0.14.1
Oct 25, 2012
#4 sop@google.com
(No comment was entered for this change.)
Status: Released