Teach the update-move code to support 'switch' as well.

* subversion/libsvn_wc/wc_db_update_move.c
  (tc_editor_baton): Add a field to remember the 'operation' (up or sw).
  (mark_tree_conflict, create_conflict_markers): Store the right operation.
  (tc_editor_alter_directory, update_working_file,
   tc_editor_alter_file, update_moved_away_conflict_victim): Pass the
    'operation' through to where it's needed.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1434352 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_wc/wc-queries.sql
  (STMT_FINALIZE_DELETE): Avoid secondary errors like that in issue #4293,
    when the primary transaction fails.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1434359 13f79535-47bb-0310-9956-ffa450edef68