Implement fancy descriptions for conflicts involving an incoming addition.
Implement fancy descriptions for conflicts involving an incoming addition.

* subversion/libsvn_client/conflicts.c
  (conflict_tree_incoming_add_details): New struct.
  (conflict_tree_get_details_incoming_add): New. Type-specific get_details()
   implementation for 'incoming add' conflicts.
  (describe_incoming_add_upon_update,
   describe_incoming_add_upon_switch,
   describe_incoming_add_upon_merge,
   describe_incoming_reverse_deletion_upon_merge): New functions. Describe
    incoming additions in more detail than the default message does.
  (conflict_tree_get_description_incoming_add): New. Type-specific
   get_description() implementation for 'incoming add' conflicts.
  (conflict_type_specific_setup): Add type-specific handlers for 'incoming add'.


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

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