Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 381279

Summary:	git compare uses old file content that was previously reset
Product:	[ECD] Orion	Reporter:	Grant Gayed <grant_gayed>
Component:	Git	Assignee:	Project Inbox <orion.git-inbox>
Status:	RESOLVED WORKSFORME	QA Contact:
Severity:	normal
Priority:	P3
Version:	0.5
Target Milestone:	---
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description Grant Gayed

2012-05-31 16:55:14 EDT

- using Chrome on orion.eclipse.org

- make a change in a .js file in org.eclipse.orion.client
- go to Git status, see in the compare that the change you just made is there
- in the "Commits for 'master' branch" section below press the Reset button, Ok
  -> your changed file disappears from the page, good
- open a new editor on the same .js file, note that your change has disappeared, good
- now make a different change to this same file and save it
- go to Git status and see that the change it shows is your first one, which should have been reset (and that the second change is not there)

Comment 1 Grant Gayed

2012-06-01 13:59:47 EDT

This happens whenever the file being compared is in the Unstaged area; when the file is moved to the Staged area then the compare is correct.  Moving it back to the Unstaged area shows the incorrect compare again.

Comment 2 Grant Gayed

2013-10-15 10:17:59 EDT

This appears to be fixed in the latest, closing report as WORKSFORME.