Unexpected warning - Non-recursive commit of moved/renamed folders

[Warning: if you're experimenting with this, use a scratch repository or one where you do not have commit access.]

Take a working copy and make three or more modifications: modify a directory's SVN properties, modify a file, and SVN copy a file, so that (for example) svn status shows

src\TortoiseProc>svn status
 M .
M CommitDlg.h
A + CommitDlg2.cpp

Now select the directory in Windows Explorer and use TortoiseSVN's SVN Commit. Check (tick) only the directory and the copied file; un-check the modified file. Click OK. I get an inappropriate warning dialog:

[Window Title]
TortoiseSVN

[Main Instruction]
Non-recursive commit of moved/renamed folders.

[Content]
This commit is not recursive, and there are moved/renamed folders selected for commit. Such moves/renames are always performed recursively in the repository. Do you want to commit anyway?

[Proceed with the commit] [Cancel] [Cancel]

Problems

1. The warning is wrong because no recursive commit will happen.

2. The message is also not accurate in referring to "moved/renamed" folders - should be "moved, renamed or copied" folders.

Suggestion

The test for this message uses the code in src\TortoiseProc\CommitDlg.cpp, function CCommitDlg::OnOK, about line 493.

            if (entry->IsCopied())
            {
                bHasCopyPlus = true;
            }

It should, I think, test whether this entry is a directory as well as a copied thing. Perhaps the variable should be renamed bDirectoryHasCopyPlus?

TortoiseSVN 1.7.9, Build 23248 - 64 Bit , 2012/08/30 18:25:37
Subversion 1.7.6,
apr 1.4.6
apr-utils 1.3.12
neon 0.29.6
OpenSSL 1.0.1c 10 May 2012
zlib 1.2.7

  - Mark.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-09-05 11:14:13 CEST