akcasoy
akcasoy

Reputation: 7225

How to deal with tree conflict while merging using TortoiseSVN, in case of a deleted folder?

I have this scenario:

Is this the right way to do it?

At very this moment, whenever i want to make sth more with SVN in the same root, i see this error:

Error: Merge tracking not allowed with missing subtrees; tryo restoring items

When i want to commit all the things i have locally merged (from SVNBranch to LocalCopyOfTrunk) to Trunk, I see the problematic folder and its content with status missing. I mark all the things I want to commit (without those missing things), click OK, and get this warning:

Non-recursive commit of moved/renamed folders (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?)

When i open the parent folder of the problematic root, TortoiseSVN->Revert, and revert them back, the SVN runs again without problem. But how do i delete them? What is the better way of resolving this tree conflict?

Upvotes: 14

Views: 39753

Answers (1)

Leonel Sanches da Silva
Leonel Sanches da Silva

Reputation: 7230

Is this the right way to do it?

No.

After performing your merge, TortoiseSVN will show a window with all tree conflicts marked in red. Double-clicking them will show a dialog with options. One of these options is "Accept current working copy state (mark as resolved)". This click makes TortoiseSVN remove the folder for you and mark the conflict as resolved.

Upvotes: 7

Related Questions