Remove the last calls to svn_wc_create_tmp_file2(), but introducing a local helper to create an empty temporary file.
Remove the last calls to svn_wc_create_tmp_file2(), but introducing a local
helper to create an empty temporary file.

* subversion/libsvn_wc/update_editor.c
  (get_empty_tmp_file): New.
  (add_file_with_history, merge_file): Use the helper to create empty temp
    files.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@880329 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion