Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 365107 - inline diff viewer showing incorrect results for my javadoc changes
Summary: inline diff viewer showing incorrect results for my javadoc changes
Status: RESOLVED FIXED
Alias: None
Product: Orion
Classification: ECD
Component: Client (show other bugs)
Version: 0.3   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: 0.4 M1   Edit
Assignee: libing wang CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-11-29 12:17 EST by Susan McCourt CLA
Modified: 2011-11-29 13:34 EST (History)
3 users (show)

See Also:

Attachments
screenshot of correct results in side by side compare (85.88 KB, image/png)
2011-11-29 12:26 EST, Susan McCourt CLA 		no flags Details
screenshot of incorrect results in inline viewer (92.21 KB, image/png)
2011-11-29 12:26 EST, Susan McCourt CLA 		no flags Details
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Susan McCourt CLA 2011-11-29 12:17:15 EST 
20111128 build, orion.eclipse.org

I was just checking some changes I made to javadoc in the git status page.  The results look wrong/corrupt.  I went back to make sure the file itself was OK.  It is.  I checked the side by side compare viewer and the results are correct.

So it seems as if the inline compare viewer is getting confused by these changes.  I'll attach screenshots to show the results in each viewer.
Comment 1 Susan McCourt CLA 2011-11-29 12:26:26 EST 
Created attachment 207670 [details]
screenshot of correct results in side by side compare
Comment 2 Susan McCourt CLA 2011-11-29 12:26:59 EST 
Created attachment 207671 [details]
screenshot of incorrect results in inline viewer
Comment 3 Susan McCourt CLA 2011-11-29 12:28:57 EST 
I just realized after taking these screenshots that the problem seems to be that the inline compare viewer on the git status page is comparing the wrong set of files.

I had two files in my git status page.

commands.js
globalCommands.js

Clicking on commands.js showed the correct inline compare.
Clicking on globalCommands.js seems to be comparing the changes in globalCommands to the content in commands.js

Weird...if the files were truly being compared then of course there would be all kinds of diffs.  It just appears as if the viewer itself is retrieving the wrong file when showing the diffs.  It's grabbing line 22 from commands.js instead of that original ine in globalCommands.js
Comment 4 libing wang CLA 2011-11-29 12:41:34 EST 
(In reply to comment #3)
> I just realized after taking these screenshots that the problem seems to be
> that the inline compare viewer on the git status page is comparing the wrong
> set of files.
> 
> I had two files in my git status page.
> 
> commands.js
> globalCommands.js
> 
> Clicking on commands.js showed the correct inline compare.
> Clicking on globalCommands.js seems to be comparing the changes in
> globalCommands to the content in commands.js
> 
> Weird...if the files were truly being compared then of course there would be
> all kinds of diffs.  It just appears as if the viewer itself is retrieving the
> wrong file when showing the diffs.  It's grabbing line 22 from commands.js
> instead of that original ine in globalCommands.js

It might due to my recent change on compare widget. Fixing it now.
Comment 5 libing wang CLA 2011-11-29 13:34:01 EST 
fixed with f4a52f6f97b8dc0b7f437c001425984565a0488e.