Georgi Posted February 19, 2015 Report Share Posted February 19, 2015 Hi, Seem there is a problem with the mergetool.exe when the files are encoded in ANSI and contain letters like äöüß (German). It treats the files as UTF-8 and in the results file you get "????". However not all of the letters are turned to ???. I have attached a modified example from the examples folder where the problem can be reproduced. Forcing the encoding in semanticmerge.exe-> configuration does not help. Furthermore the mergetool receives the encoding correctly -e="Windows-1252" so says the log. However if you set manually the encoding on Windows-1252 for Dest, Src, Base, Result in mergetool.exe->Options menu , even though it shows äüö in the corresponding windows, after saving&exit in the semanticmerge is everything ok. However i am not going to manually set the encoding every time for every merge when I have several thousands of files to merge. I already opened a Ticket. I am just hoping anyone here has some ideas in the mean time. P.S. Ticket: http://plasticscmsupport.zendesk.com/requests/6527 Socket_Deeper.zip Link to comment Share on other sites More sharing options...
calbzam Posted February 19, 2015 Report Share Posted February 19, 2015 Hi, I´m running your attached example: mergetool -s=src.cs -b=base.cs -d=dst.cs I manually solve the merge conflicts, and the resulf file doesn´t have "???" characters. Could you tell me the command you are running to reproduce the issue? Regards, Carlos. Link to comment Share on other sites More sharing options...
Georgi Posted February 19, 2015 Author Report Share Posted February 19, 2015 I am using the samplesemanticmergetool.bat file Link to comment Share on other sites More sharing options...
calbzam Posted February 20, 2015 Report Share Posted February 20, 2015 Hi, We have reproducded the issue. We have created a task to fix it asap. Sorry for the inconvenices. Regards, Carlos. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.