Resolve issue #1589 -- "svn_io_temp_dir() inappropriate for some wc write ops".  In the context of merge (a read/write operation), create the temp file in the working directory instead of the system's tempdir.
Resolve issue #1589 -- "svn_io_temp_dir() inappropriate for some wc
write ops".  In the context of merge (a read/write operation), create
the temp file in the working directory instead of the system's tempdir.

* subversion/libsvn_client/repos_diff.c
  (create_empty_file): New parameter HAVE_WRITE_LOCK.  If TRUE, create the 
    temp file in the working directory instead of the system's tempdir.
  (get_empty_file): Determine whether we have a write lock.
  (apply_textdelta): Determine whether we have a write lock.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion