Re: "The diffing engine aborted because of an error"

On 14.10.2013 10:47, Pavel Lyalyakin wrote:
> Hello,
>
> If a file has a property and a text conflict and we choose to solve
> the property conflict selecting "Resolve using their property", then
> we get the error:
>
> [[
> The diffing engine aborted because of an error:
> Can't open file 'C:\foo\bar\test.txt.r2': The system cannot find the
> file specified.
> ]]
>
> The property and the text conflict is solved using incoming values,
> however TortoiseSVN did not ask us how we want to solve the text
> conflict.
>
> Can reproduce with TortoiseSVN 1.8.2 x64.
>
> Reproduction script:
>
> 1. In a working copy, create new file "test.txt" with CONTENTS as
> text, add it to SVN and commit (r1),
> 2. Modify the "test.txt" file: change text to KONTENTS and add new
> custom mime-type property "/A", commit (r2),
> 3. Update the working copy to r1,
> 4. Modify "text.txt" to CONTENTZ and add custom mime-type property "/B",
> 5. Update working copy.
> "text.txt" file is conflicted.
> 6. Choose "Edit Conflicts" for "text.txt", select "Resolve using their
> property".
>
> Error dialog:
>
> ---------------------------
> TortoiseMerge
> ---------------------------
> The diffing engine aborted because of an error:
> Can't open file 'C:\foo\bar\test.txt.r2': The system cannot find the
> file specified.
> ---------------------------
> OK
> ---------------------------

Created issue #578 for this:
http://code.google.com/p/tortoisesvn/issues/detail?id=578

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=3066312
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].