This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
The diff component (in this case the "Merge Conflicts resolver") shows mangled umlauts when merging local and remote files. E.g. "nötig" becomes "nötig". This doesn't affect the source code but it is really irritating when you try to find out which problems exists when merging. Product Version: NetBeans IDE Dev (Build 200710030000) Java: 1.6.0_02; Java HotSpot(TM) Client VM 1.6.0_02-b06 System: Windows 2000 version 5.0 running on x86; Cp1252; de_DE (nb)
Same issue here. The issue seems to be related with Merge Conflicts Resolver window not displaying the file in the configured encoding (UTF-8 in my case). The original source window displays correctly non-us_ascii chars (please see the attached screenshot). The main problem with this issue is that, once the conflicts are resolved, the file is saved using the same encoding as in Merge Conflicts Resolver window, so all non-us_ascii chars aren't saved correctly. the steps to reproduce the issue would be: 1.- Create a java source file with non-us_ascii chars. 2.- Upload it to a repo (I'm using SVN, don't know if it also reproducible with CVS). 3.- Force a conflict. 4.- Update the file, so NB can detect the conflict. 5.- Right click -> resolve conflict to display Merge Conflicts Resolver window. 6.- Solve conflicts. 7.- Save file. 8.- All non-us_ascii chars aren't saved correctly I don't remember this happening with NB5.5 Product Version = NetBeans IDE 6.0 (Build 200711261600) Operating System = Windows XP version 5.1 running on x86 Java; VM; Vendor = 1.6.0_04; Java HotSpot(TM) Client VM 10.0-b19; Sun Microsystems Inc.
Created attachment 60480 [details] Merge Conflicts resolver windonw
I also think that the priority of this issue should be raised, as it can break source code in case you use non-us_ascii chars for identifiers
should be already fixed. there were some encoding related issues fiex in diff/merge in the meantime. please verify if the problem still appear in 6.5 and feel free to reopen othwerwise thanks