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

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

From: Vladimirs <vladimirs.surajevs_at_i-designplc.com>
Date: Mon, 20 Mar 2017 03:19:33 -0700 (PDT)


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



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-03-20 17:58:03 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.