In the conflict resolver, ensure we don't leave temp files behind upon error.
In the conflict resolver, ensure we don't leave temp files behind upon error.

* subversion/libsvn_wc/wc_db_update_move.c
  (tc_editor_incoming_add_file): Remove the content copy in cases where this
   removal won't be handled by the work queue.
  (update_incoming_moved_node): Allow cancellation during file content copy and
   ensure we won't leave the temporary file on disk if the copy is cancelled.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion