Why do I get tree conflicts between identical files?

Question

I have my trunk, and I have a branch: toast. I've made changes to the toast branch and want to merge them back into trunk. This has been done many times before and I didn't expect to encounter any problems.

I have a directory of images that haven't been altered at all, nor has the path to the directory. Can someone please explain to me why I would get a tree conflict for every image in the directory?

Answer 1

I've gotten tree conflicts on files when I have a branch that I've kept up-to-date from trunk, and then merged that branch back into trunk.

These conflicts look like this:

C   path/to/some/file.ext
>   local add, incoming add upon merge
C   path/to/some/other/file.ext
>   local delete, incoming delete upon merge 

So it's always the same exact change (verified by inspecting the diff), but seems that SVN is not smart enough to know that the remote change (from the branch) came from the local change (trunk) as I was keeping the branch updated.

When I know this to be the case, I just resolve them all:

$ svn resolve --accept working -R .

Note: svn version 1.7.19