Following up on r1658146, fix a few more issues in handling replacements during move-update handling.
Following up on r1658146, fix a few more issues in handling replacements
during move-update handling.

This fixes an invalid obstruction tree conflict on virtually all replacements.

* subversion/libsvn_wc/wc_db_update_move.c
  (tc_editor_add_directory): When replacing ignore what is in the working
    copy if the type matches. Use a simple if like in add_file.
  (tc_editor_add_file): When replacing ignore what is in the working
    copy if the type matches.
  (tc_editor_delete): Properly record delete for the root when replaceing.
    Fix pool lifetime issue.


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

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