Merge deleted/added files with the same name

I recently attempted to merge from the "trunk" to a "branch", on the
"trunk" a set of files had been deleted and new files with the same name
had been added, the merged failed. I did some research and it appears
this might be resolved in version 1.4, is that true?

Thanks,

Wink Saville

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Aug 12 18:19:41 2006