Tree conflict help.

From: Reed, Mark (TBS) <Mark.Reed_at_turner.com>
Date: Tue, 8 Dec 2009 18:16:55 -0500

Ok, I'm at a loss, and would appreciate it if someone could help me
figure out what's going on. I can't do any clean merges within this
project. Even if I create a brand new branch by copying the trunk, make
absolutely no changes to the branch, and then try to merge the trunk
back into the branch - which should be a no-op - I get 11 tree
conflicts, all of them either "local add, incoming add upon merge" or
"local obstruction, incoming add upon merge".

Any help appreciated. Transcript below showing the problem, more info
available upon request. I suspect the "Merging r3519 through r4865" has
something to do with it - why would it be merging back to 1300 revisions
ago when I just created the branch off the current revision?

$ svn -q co "$url" myproj

$ cd myproj

$ svn -q cp trunk branches/new

$ svn commit -m"testing tree conflicts" branches/new

Adding branches/new

Committed revision 4865.

$ cd branches/new

$ svn merge "$url"/trunk

--- Merging r3519 through r4865 into '.':

C tmp

C tests

C logs

C lib

C scripts

C static

C calendar

C etc

C README

C htaccess.sample

C views

G .

Summary of conflicts:

Tree conflicts: 11

$ svn status

C tmp