During update a deleted node is not replaced until close_file or close_directory is called to add the replacement, so we can safely delay the updating of the tree conflict.
During update a deleted node is not replaced until close_file or
close_directory is called to add the replacement, so we can safely
delay the updating of the tree conflict.

* subversion/libsvn_wc/update_editor.c
  (add_directory,
   add_file): Don't add the tree conflict here. Store it for a later install
     instead.


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

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