[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Missing file name in merge conflict dialog box message

From: Timur Khanipov <khanipov_at_gmail.com>
Date: Tue, 3 Mar 2015 06:51:32 -0800 (PST)

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.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3102542

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

tortoise_message.png
Received on 2015-03-03 16:02:31 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.