Re: TortoiseProc.exe crashes with binary file conflict

On 04.05.2011 01:25, Daniel Becroft wrote:

> Thanks, Stefan. I'm not sure if it's related to the same problem, but
> TortoiseMerge reports the following error when selecting "Edit conflict":
>
> ---------------------------
> TortoiseMerge
> ---------------------------
> The diffing engine aborted because of an error:
> Can't open file 'svn-9A19D28E': The system cannot find the file specified.
> ---------------------------
> OK
> ---------------------------
>
> If I select "Resolve later", and then choose "Edit conflict" on the
> individual file, it works correctly.

Fixed in r21297.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2730185
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].