How to resolve non-recursive commit of moved/renamed folders

[Vladimirs]

Hi,

I committed my changes to Branch A (couple file changes + added a new folder and new file in that folder).

Then I merged changes forward to Branch B, however when I am trying to commit I get "Non-recursive commit of moved/renamed folders" warning. In changelist I can see:

New Folder Added (+)
New Folder/New File Normal (+)

Why this is happening? I simply added a new folder with new file to Branch A and folder doesn't exist in Branch B so I would expect a straight-forward merge.

What I tried?

1) hit F5 on commit dialog, but that only results into New Folder and New File duplicated entries.
2) perform a full clean-up (including reverting config changes from ignore on commit section)
3) revert and merge again with fully recursive merge depth

TortoiseSVN 1.9.4, Build 27285 - 64 Bit , 2016/04/24 13:59:58

Subversion 1.9.4, -release

Thanks,
Vladimirs.

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

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

[Gavin Lambert]

On 20/03/2017 23:19, Vladimirs wrote:
> I committed my changes to Branch A (couple file changes + added a new
> folder and new file in that folder).
>
> Then I merged changes forward to Branch B, however when I am trying
> to commit I get "Non-recursive commit of moved/renamed folders"
> warning. In changelist I can see:
>
> New Folder Added (+) New Folder/New File Normal (+)
>
> Why this is happening? I simply added a new folder with new file to
> Branch A and folder doesn't exist in Branch B so I would expect a
> straight-forward merge.

You need to commit/merge the common base folder of the old and new
locations, not the individual folders themselves.

It's usually best to always do commits/merges at the root of the
repository, never in a subfolder.

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