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

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

From: Gavin Lambert <tsvn_at_mirality.co.nz>
Date: Thu, 23 Mar 2017 18:11:52 +1300

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.


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