Re: Missing file name in merge conflict dialog box message

On 03.03.2015 15:51, Timur Khanipov wrote:
> In the dialog box which appears in case of tree conflict when file to be modified does not exist locally, the file name is missing in the main message. Instead of file name there are double quotes. See the attached screenshot.
>
> At the same time using command line svn produces a different (and correct) message:
>
> Tree conflict on 'offline.xml'
> > local file missing, incoming file edit upon merge
>
> So its probably a TortoiseSVN problem.
>
> I am using Tortoise version 1.8.10.26129 for Windows x64.

Fixed in r26340.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3102892
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].