BUG: Says tried to modify a directory, but really was a file

From: Matthias Bolliger <Matthias.Bolliger_at_aaro.se>
Date: Fri, 25 Nov 2016 14:31:38 +0000

Hi,

Using the latest released TortoiseSVN (1.9.4, Build 27285 - 64 Bit),

I do a merge.

The revision that I merge from consists only of simple changes to a few files (no added or deleted files, and no folder changes at all).

Two of the files, however, do not exist in the source folder.

This situation, naturally, cannot be solved fully by SVN.

This bug report is only about the wording in the conflict message. It now says (in my example):

"The last merge operation tried to modify the directory 'XLPAMacro.dfm', but the file is missing locally (deleted or moved away?)."

1. It should say "the file", not "the directory", since it is a file.

2. Maybe (a suggestion), the tip "(deleted or moved away?)" could be enhanced to "(deleted, moved away, or not yet created/merged?)".

Kind regards,
Matthias Bolliger

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

Received on 2016-11-26 09:06:51 CET