svnmerge.py issue: Attempted to get textual contents of a *non*-file node

Hi,

While using the svnmerge.py tool, I ran into a problem where if the
directory name is the same as a filename within that directory, the
following error would be given:

svn: Attempted to get textual contents of a *non*-file node

The exact problem described here:

http://svn.haxx.se/dev/archive-2004-10/1484.shtml

The solution in the thread is to move up to the parent directory and
specify the directory name instead of "." (specifying "." is what
svnmerge.py currently does). I check for this condition and make the
directory name this instead:

../<current directory>

This fixed the problem for me, and I'm attaching a patch. Note that
the patch has not been thoroughly tested.

Thanks!
-Roberto.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org