Possible svn 1.6 cp bug that leads to tree conflict?

I found this problem while working with svn 1.6 cp + merge. Basically, a
circumstance where a branch created with svn cp cannot be merged back to
trunk despite no changes being made to the branch. I was able to
reproduce the problem with svn 1.6.0 - 1.6.6, while svn 1.5.7 works.

To reproduce, run:

svnadmin create repo # create and checkout a repository
svn co file:///$PWD/repo wc
cd wc # create trunk, trunk/test, trunk/test/file
svn mkdir trunk
svn ci -m ''
svn mkdir trunk/test
touch trunk/test/file
svn add trunk/test/file
svn ci -m '' # shows adding branch, branch/test
svn cp trunk branch # copy trunk to branch
svn ci -m ''
svn up
cd trunk
svn merge ^/branch . # now merge branch to trunk. this fails with a tree
conflict
--- Merging r2 through r3 into '.':
   C test
Summary of conflicts:
  Tree conflicts: 1

Here's a workaround. If I remove trunk from the working directory and
svn up, then only svn cp and ci, it shows that it's adding branch
(without branch/test). The merge then completes successfully:

svnadmin create repo
svn co file:///$PWD/repo wc
cd wc
svn mkdir trunk
svn ci -m ''
svn mkdir trunk/test
touch trunk/test/file
svn add trunk/test/file
svn ci -m ''
rm -fR trunk # note this extra step of removing trunk and svn updating it
svn up
svn cp trunk branch
svn ci -m ''
svn update
cd trunk
svn merge ^/branch . # successful

With svn 1.5.7, I get:

Skipped 'test'
--- Merging r2 through r3 into '.':
A test/file

Can anyone comment whether this is expected behavior?

-- 
regards,
wK
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2419760
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].