Directory Merges and svn:ignore

svn 1.1.1, W2K

I have two branches, development and release, and merged some bug fixes
from the release branch into the development working copy by merging
the whole source directory. It appears that the svn:ignore property in
the release branch came along with the merge, which makes sense as it's
a property of the directory. However the things I want ignored are not
the same in the two branches so this was not the desired behavior. I
can reset it as I keep the ignores for each directory in a text file in
that directory, but I'm wondering if there is a way to prevent this
when merging a whoe directory.

Thanks,

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