The best solution to rename a directory when some peoples have local modifications

We want to rename a directory in the svn repository.

a rename operation correspond to a copy and delete operation. So the
revision number of all the files change has well.
the problem is that peoples that has locals modifications in the older
directory can't do the delete and only do the add.

is there a solution to only rename the directory and then allow a local
update to rename the directory without changing the revision number of all
files within it ?
if not how can you merge the local modification of the older directory
with the new directory if their is conflicts ?

thanks

-- 
Boutillier Alexis
Methodology engineer
Arteris SA
The Network-on-Chip Company (TM)
www.arteris.net
6 parc Ariane Immeuble Mercure
78284 Guyancourt Cedex
France
Office: (+33) 1 61 37 38 71
Fac:    (+33) 1 61 37 38 41
Alexis.Boutillier@arteris.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org