Merge files from a moved directory

[Emiliano S]

Hi,

Suppose there's a directory with a single file in it:
    dirA\foo.c    r10

While I'm modifying this file someone else modifies the file, renames 
dirA to dirB and commits.

    dirB\foo.c    r11

Before committing I try to update and get a tree conflict, status shows 
this:

A  +  C dirA
> local edit, incoming delete upon update
M  +    dirA/foo.c

Now I have dirA and dirB in my working copy.
Is there any graceful way to make subversion merge my file with the 
newest version?
What if instead of a single file there are many?

I'm using Subversion 1.6.12.