Re: merge on UTF-16 text files fails

Patrick Martin (gmail) wrote:
> 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
> ---------------------------

Thanks for the report. I fixed the corrupted saving of utf-16 files in
revision 7694.
But I can't get TortoiseMerge to crash when diffing those corrupted
files. Can you maybe zip your files up and send them to me? (if you need
to know which files TMerge diffs, create the registry key
HKCU\Software\TortoiseMerge\Debug
and set the DWORD value to 1. Then TMerge will show you the command line
it was started with so you can find the paths to all the files it will
diff. Maybe also hit Ctrl-C when the dialog box shows up and paste it
back in the mail so I know exactly how TMerge was started.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org