Clean up some obsolete code from the update editor.
Clean up some obsolete code from the update editor.

Some of this logic can be reintroduced in the adm_crawler once we have
a way to store an obstruction status.

* subversion/libsvn_wc/update_editor.c
  (do_entry_deletion): Don't mark the tree skipped. This could break additions
    of new files/directories.

  (add_directory): Remove automatic conflict resolving. This specialized case
    would show up as deleted now and add_directory wouldn't be called.
  (open_directory): Document that deleted and replaced are the only valid
    tree conflicts in this code path.

  (add_file): Remove automatic conflict resolving. This specialized case would
    show up as deleted now and add_file wouldn't be called.
  (open_file): Document that deleted and replaced are the only valid tree
    conflicts in this code path.


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

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