Can't resolve tree conflict with SVN

Question

Hi,

I recently encountered a very weird behavior of subversion.

I just merged my local copy of a branch with a remote branch. Everything went smooth, but I've got 1 tree conflict (local delete, remote update).

Okay, thought I, modified the working copy appropriately and ran "svn resolve --accept=working -R .".

Subversion told that it has resolved my problems and "svn st" no longer showed any issues. So, I tried to commit, but svn told me that one of the inner folders (inside my conflicted one) was out of date and suggested to svn up, BUT it made the folder to be in conflict again!

What shall I do to get out of this visious circle?

Answer 1

You can use an other way than the svn resolve command:

1. Create a patch of the conflicted file. (or a backup of your version of the conflicted folder with svn export ...)
2. Update your repository (svn update)
3. Apply the patch previously done (or replace the conflicted file/folder with the backup)
4. Commit the change (svn commit)

Answer 2

This may or may not help, but sometimes an "svn cleanup" will fix weird metadata issues. If you check out a clean working copy, does the clean copy have the same issue? If so then the previous answer sounds like a step in the right direction