Add detailed conflict descriptions for conflicts involving incoming replacements and enhance all the other existing conflict descriptions.
Add detailed conflict descriptions for conflicts involving incoming
replacements and enhance all the other existing conflict descriptions.

* subversion/libsvn_client/conflicts.c
  (conflict_type_specific_setup): Enable fancy descriptions for conflicts
   invocling incoming replacements.
  (describe_incoming_deletion_upon_switch,
   describe_incoming_reverse_addition_upon_switch,
   describe_incoming_deletion_upon_merge,
   describe_incoming_reverse_addition_upon_merge): Add descriptions for
    conflicts involving replacements, and enhance existing descriptions.
  (describe_incoming_deletion_upon_update,
   describe_incoming_reverse_addition_upon_update): Same, adding a new
   'old_rev' parameter for enhanced descriptions.
  (describe_incoming_deletion_upon_update): Update caller.


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

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