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

Bug 345160

Summary:	Wrong file encoding in compare views
Product:	[Technology] EGit	Reporter:	Stefan Lay <stefan.lay>
Component:	UI	Assignee:	Project Inbox <egit.ui-inbox>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	h.klene, robin
Version:	1.0
Target Milestone:	---
Hardware:	All
OS:	All
Whiteboard:

Description Stefan Lay

2011-05-09 11:33:57 EDT

When opening a compare editor of a file that has a
different encoding than the workspace encoding, it contains incorrect
changes.

This bug was fixed for the commit dialog with commit 17cc1ec58b6c (Gerrit http://egit.eclipse.org/r/#change,3330).

It still has to be fixed in:

- Compare With commands
- History View commands
- the new Staging View

Comment 1 Robin Stocker

2011-05-21 09:06:49 EDT

Pushed changes to fix encoding issues for Compare With commands:

http://egit.eclipse.org/r/3488
http://egit.eclipse.org/r/3489
http://egit.eclipse.org/r/3490
http://egit.eclipse.org/r/3491
http://egit.eclipse.org/r/3492

Comment 2 Robin Stocker

2011-05-30 04:41:26 EDT

Only one left to review.

Not all of the changes are on stable-1.0, some are only in master. Should these also be submitted for stable-1.0? These would be the ones:

http://egit.eclipse.org/r/#change,3490
http://egit.eclipse.org/r/#change,3489

Comment 3 Holger Klene

2011-06-12 13:25:55 EDT

Is this also a fix for Bug 333310 ?

Comment 4 Stefan Lay

2011-08-17 11:52:07 EDT

Thanks to Robin I think all the issues are solved.

Comment 5 Robin Stocker

2011-08-17 12:43:29 EDT

This one is still needed:

http://egit.eclipse.org/r/#change,3948