Add a test for the 'incoming add ignore' resolver option with 'svn switch'.
Add a test for the 'incoming add ignore' resolver option with 'svn switch'.

* subversion/tests/libsvn_client/conflicts-test.c
  (create_wc_with_file_add_vs_file_add_merge_conflict): Add a do_switch flag,
   which creates a tree conflict caused by a switch instead of a merge.
  (test_merge_incoming_added_file_ignore,
   test_merge_incoming_added_file_text_merge,
   test_merge_incoming_added_file_replace
   test_merge_incoming_added_file_replace_and_merge): Adjust callers.
  (test_switch_incoming_added_file_ignore, test_funcs): New test.


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

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