What does non-recursive mean?

Hello

I recently renamed some source files in a small repository, and
modified the svn:ignore property to reflect the name change. I then
committed these modifications. It turns out that the property
modification was incorrect, so I want to undo it. In principal it's
easy, I run merge

svn merge -r34:33 . .

but that undoes the renames as well. The --non-recursive flag doesn't
help, because the file renames occurred in the same commit as the
property change and they are direct children of the directory.

We don't have a way of referring to the directory only.

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