As intended, better warning and/or conflict handling is coming. See the current state of trunk development here:
https://cwiki.apache.org/confluence/display/SVN/Shelving+in+Svn-trunk
If you have further ideas on how to develop it, please do let us know!
- Julian