Bug with directory containing file with the same name as the directory

I have a problem with 'merge' subcommand on subdirectories containing a
file with the same name as the subdirectory itself. The error message is
"svn: Attempted to get textual contents of a *non*-file node".

Is this bug known? Is there a work-around? Is there a patch? I have this
problem with both 1.0.6 and 1.0.9. Please help!

My platform is Linux, db4.0, apr and apr-util 0.9.5, neon 0.24.7. Example:

mkdir foo
cd foo
echo "Hello" > foo
cd ..

svnadmin create /extra/svn-test
svn import foo file:///extra/svn-test/foo -m 'initial import'
rm -rf foo
svn checkout file:///extra/svn-test/foo

svn mkdir file:///extra/svn-test/releases -m 'create release directory'
svn copy file:///extra/svn-test/foo file:///extra/svn-test/releases/foo
-m 'tagging release'

cd foo
svn merge file:///extra/svn-test/releases/foo file:///extra/svn-test/foo

The last command now generates the error message
"svn: Attempted to get textual contents of a *non*-file node"
Received on Thu Oct 28 03:47:30 2004