Problem with merge and a deleted file

I'm getting this error while trying to merge back something to the trunk
from a branch:

svn: Use --force to override this restriction
svn: 'AltaDisponibilidad/Scripts/src/reubicar_servicio.c' is not under
version control

That file was deleted in the "trunk". Why can't subversion cope with
this? (probably handling this as a conflict and carrying on) Isn't this
a bug?

Thanks!

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat May 15 19:44:51 2004