Hi; I can't find anything relating to this, so I'd like to raise an issue
TortoiseMerge has with UTF-16 text files.
Steps to reproduce are:
- create a text file in Notepad
- type line of "this is the first line"
- save as type "Unicode"
- commit to source control
- check out the file in one location and add line "this is the second
line"
- check out the file in another location and add line "this is the #2
line"
- commit from the first location
- update the second location: file becomes conflicted, as is expected,
as SVN has no native UTF-16 support
- Edit Conflicts and use one file for the conflicted 2nd line; the
merge result second line is shown as the line chosen for the conflicted
region
- Save and Mark Conflict Resolved
- Open text file and note that content on disk is in fact corrupted
- Use "SVN Diff" from the TortoiseSVN context menu and get crash with
message box:
---------------------------
TortoiseMerge: TortoiseMerge.exe - Application Error
---------------------------
The exception unknown software exception (0xc000000d) occurred in the
application at location 0x78138890.
Click on OK to terminate the program
Click on CANCEL to debug the program
---------------------------
OK Cancel
---------------------------
Hope this helps.
Patrick
Received on Tue Oct 3 06:50:26 2006