1486: Diff viewer displays incorrectly diffs for files which were removed in later revision of the change

petrva*******@gmai***** (Google Code) (Is this you? Claim this profile.)
Feb. 6, 2014
1739, 2193, 2455, 2591, 2950
What version are you running?

What's the URL of the page containing the problem?

vmware's reviewboard/r/127239/diff/1-2/#index_header

What steps will reproduce the problem?
1. Create change which modifies file A and file B.
2. Upload diff to reviewboard.
3. Remove file B from the changeset.
4. Upload new diff to reviewboard.
5. Ask reviewboard to show changes between version 1 and version 2.

What is the expected output? What do you see instead?

I would expect to see changed variant of the file on left, and unchanged 
(new one) on right.  Instead I see unmodified version from the perforce on 
the left, and modified one (one which is not part of r2 version at all) on 
the right.

What operating system are you using? What browser?

Windows, Chrome 4.

Please provide any additional information below.
#1 chipx86
Will check on this for 1.5.
  • -Priority-Medium
#3 chipx86
This is going to have to slip, but we still need to get it done soon. I just don't feel comfortable touching interdiff code in an RC.
  • -Milestone-Release1.5
#4 chipx86
  • +Milestone-Release1.6.x
#5 hongb*****@gmai***** (Google Code) (Is this you? Claim this profile.)
  • +hongb*****@gmai***** (Google Code)
#6 hongb*****@gmai***** (Google Code) (Is this you? Claim this profile.)
Can't reproduce in RB 1.7 dev. Since this is an old bug, I doubt it have been fixed. It will be great if anyone can confirm whether this bug still occurs. Thanks.
  • +NeedInfo
#7 david
Still occurs.
  • -NeedInfo
#11 smth*****@gmai***** (Google Code) (Is this you? Claim this profile.)
Couldn't reproduce this on 1.7.1 (I've tried with existing files and new ones as well)
#12 zoeng******@gmai***** (Google Code) (Is this you? Claim this profile.)
On a fresh install of 1.7.6, this still occurs for me.

In a review which added several files, two of which were deleted in the third revision to the review, one of those files shows up properly as deleted while the other shows as new.

When viewing the overall diff including all changes from all revisions, not just the changes between revisions 2 and 3, both files are properly not listed.
#13 david
This is fixed in 1.7.7
  • -New
#14 david
Oops, I was confused. Nevermind :(
  • -Fixed
#15 chipx86
But it's okay! As it happens, I'm on an interdiff bug fixing spree today, and this will be in 1.7.8.
  • -New
  • -Milestone-Release1.6.x
  • -hongb*****@gmai***** (Google Code)
#16 satish3
Hi Team,
We are facing similar issue on Review Board, can you please share the patch if its fixed.

#17 satish3
Hi team,
Please point me the patch for this bug.

#18 chipx86
There's no patch, or we'd have a fix in.

We're evaluating possible solutions for 1.8.
  • -Milestone-Release1.7.x
#20 david
  • -Milestone-Release1.8
#21 david
  • -Started
  • -chipx86
#22 david
Fixed in master (2da7f9e). This will ship in 2.0 beta 3.
  • -PendingReview