TortoiseSVN is giving me a Tree Conflict

I had branched from trunk a few weeks ago. I made some changes on the branch, including moving some directories. Committed the directory move changes then merged them back to the trunk (the other changes remained on the branch for a future revision).

Now, I want to merge the trunk changes to the branch to continue development of the future revision. I had tagged the repository pre and post merge and logged that I made a merge when I committed the initial merge to trunk. I used the merged revision # as my From revision and the latest rev (also ha开发者_如何学Pythonppens to be HEAD right now) as the To rev.

The merge today was filled with conflicts, including tree conflicts on the directories that were previously moved and merged successfully. This is a problem since there are changes and new additions within the relocated dirs (nothing to do with the old locations).

What did I do wrong?

The problem is SVN knows about merging only in one way, only tree that you commit after merge knows that it was merge (in 1.5+). In my opinion You have conflicts because SVN try to make changes to branch that are from branch and was merged to trunk. Try first to merge commit(s) to trunk that are merged from branch with --record-only. record-only does only cahnge merge-info property. After that merge (and commit to branch) You should be able to merge another commits from trunk.